Update to glib 0.14
authorColin Walters <walters@verbum.org>
Thu, 24 Jun 2021 21:38:16 +0000 (17:38 -0400)
committerColin Walters <walters@verbum.org>
Fri, 6 May 2022 16:53:56 +0000 (12:53 -0400)
An intimidating spam of compiler errors at the start, but the
biggest was handling the new convention of `ostree_sys::` => `ffi::`.

This will require a semver bump of course.

58 files changed:
rust-bindings/rust/Cargo.toml
rust-bindings/rust/Makefile
rust-bindings/rust/conf/ostree-sys.toml
rust-bindings/rust/conf/ostree.toml
rust-bindings/rust/src/auto/async_progress.rs
rust-bindings/rust/src/auto/bootconfig_parser.rs
rust-bindings/rust/src/auto/collection_ref.rs
rust-bindings/rust/src/auto/commit_sizes_entry.rs
rust-bindings/rust/src/auto/constants.rs
rust-bindings/rust/src/auto/content_writer.rs
rust-bindings/rust/src/auto/deployment.rs
rust-bindings/rust/src/auto/diff_item.rs
rust-bindings/rust/src/auto/enums.rs
rust-bindings/rust/src/auto/flags.rs
rust-bindings/rust/src/auto/functions.rs
rust-bindings/rust/src/auto/gpg_verify_result.rs
rust-bindings/rust/src/auto/mod.rs
rust-bindings/rust/src/auto/mutable_tree.rs
rust-bindings/rust/src/auto/remote.rs
rust-bindings/rust/src/auto/repo.rs
rust-bindings/rust/src/auto/repo_commit_modifier.rs
rust-bindings/rust/src/auto/repo_dev_ino_cache.rs
rust-bindings/rust/src/auto/repo_file.rs
rust-bindings/rust/src/auto/repo_finder.rs
rust-bindings/rust/src/auto/repo_finder_avahi.rs
rust-bindings/rust/src/auto/repo_finder_config.rs
rust-bindings/rust/src/auto/repo_finder_mount.rs
rust-bindings/rust/src/auto/repo_finder_override.rs
rust-bindings/rust/src/auto/repo_finder_result.rs
rust-bindings/rust/src/auto/se_policy.rs
rust-bindings/rust/src/auto/sign.rs
rust-bindings/rust/src/auto/sysroot.rs
rust-bindings/rust/src/auto/sysroot_upgrader.rs
rust-bindings/rust/src/auto/versions.txt
rust-bindings/rust/src/checksum.rs
rust-bindings/rust/src/collection_ref.rs
rust-bindings/rust/src/functions.rs
rust-bindings/rust/src/kernel_args.rs
rust-bindings/rust/src/lib.rs
rust-bindings/rust/src/object_name.rs
rust-bindings/rust/src/repo.rs
rust-bindings/rust/src/repo_checkout_at_options/mod.rs
rust-bindings/rust/src/repo_checkout_at_options/repo_checkout_filter.rs
rust-bindings/rust/src/repo_transaction_stats.rs
rust-bindings/rust/src/se_policy.rs
rust-bindings/rust/src/sysroot_deploy_tree_opts.rs
rust-bindings/rust/src/sysroot_write_deployments_opts.rs
rust-bindings/rust/sys/Cargo.toml
rust-bindings/rust/sys/build.rs
rust-bindings/rust/sys/src/auto/versions.txt
rust-bindings/rust/sys/src/lib.rs
rust-bindings/rust/sys/tests/abi.rs
rust-bindings/rust/sys/tests/constant.c
rust-bindings/rust/sys/tests/layout.c
rust-bindings/rust/tests/functions/mod.rs
rust-bindings/rust/tests/repo/mod.rs
rust-bindings/rust/tests/tests.rs
rust-bindings/rust/tests/util/mod.rs

index 3936ab6d74682bb258818ec512f17a358a23fae9..2e78e34bc8954d6b786c7283f87f9d4cd6c946ba 100644 (file)
@@ -2,6 +2,7 @@
 name = "ostree"
 version = "0.11.0"
 authors = ["Felix Krull"]
+edition = "2018"
 
 license = "MIT"
 description = "Rust bindings for libostree"
@@ -34,13 +35,13 @@ members = [".", "sys"]
 [dependencies]
 libc = "0.2"
 bitflags = "1.2.1"
-glib = "0.10.1"
-gio = "0.9.0"
-glib-sys = "0.10.0"
-gobject-sys = "0.10.0"
-gio-sys = "0.10.0"
+glib = "0.14.0"
+gio = "0.14.0"
+glib-sys = "0.14.0"
+gobject-sys = "0.14.0"
+gio-sys = "0.14.0"
 once_cell = "1.4.0"
-ostree-sys = { version = "0.7.3", path = "sys" }
+ffi = { package = "ostree-sys", path = "sys" }
 radix64 = "0.6.2"
 hex = "0.4.2"
 thiserror = "1.0.20"
@@ -51,43 +52,43 @@ openat = "0.1.19"
 tempfile = "3"
 
 [features]
-dox = ["ostree-sys/dox"]
-v2014_9 = ["ostree-sys/v2014_9"]
-v2015_7 = ["v2014_9", "ostree-sys/v2015_7"]
-v2016_3 = ["v2015_7", "ostree-sys/v2016_3"]
-v2016_4 = ["v2015_7", "ostree-sys/v2016_4"]
-v2016_5 = ["v2016_4", "ostree-sys/v2016_5"]
-v2016_6 = ["v2016_5", "ostree-sys/v2016_6"]
-v2016_7 = ["v2016_6", "ostree-sys/v2016_7"]
-v2016_8 = ["v2016_7", "ostree-sys/v2016_8"]
-v2016_14 = ["v2016_8", "ostree-sys/v2016_14"]
-v2017_1 = ["v2016_14", "ostree-sys/v2017_1"]
-v2017_2 = ["v2017_1", "ostree-sys/v2017_2"]
-v2017_3 = ["v2017_2", "ostree-sys/v2017_3"]
-v2017_4 = ["v2017_3", "ostree-sys/v2017_4"]
-v2017_6 = ["v2017_4", "ostree-sys/v2017_6"]
-v2017_7 = ["v2017_6", "ostree-sys/v2017_7"]
-v2017_8 = ["v2017_7", "ostree-sys/v2017_8"]
-v2017_9 = ["v2017_8", "ostree-sys/v2017_9"]
-v2017_10 = ["v2017_9", "ostree-sys/v2017_10"]
-v2017_11 = ["v2017_10", "ostree-sys/v2017_11"]
-v2017_12 = ["v2017_11", "ostree-sys/v2017_12"]
-v2017_13 = ["v2017_12", "ostree-sys/v2017_13"]
-v2017_15 = ["v2017_13", "ostree-sys/v2017_15"]
-v2018_2 = ["v2017_15", "ostree-sys/v2018_2"]
-v2018_3 = ["v2018_2", "ostree-sys/v2018_3"]
-v2018_5 = ["v2018_3", "ostree-sys/v2018_5"]
-v2018_6 = ["v2018_5", "ostree-sys/v2018_6"]
-v2018_7 = ["v2018_6", "ostree-sys/v2018_7"]
-v2018_9 = ["v2018_7", "ostree-sys/v2018_9"]
-v2019_2 = ["v2018_9", "ostree-sys/v2019_2"]
-v2019_3 = ["v2019_2", "ostree-sys/v2019_3"]
-v2019_4 = ["v2019_3", "ostree-sys/v2019_4"]
-v2019_6 = ["v2019_4", "ostree-sys/v2019_6"]
-v2020_1 = ["v2019_6", "ostree-sys/v2020_1"]
-v2020_2 = ["v2020_1", "ostree-sys/v2020_2"]
-v2020_4 = ["v2020_2", "ostree-sys/v2020_4"]
-v2020_7 = ["v2020_4", "ostree-sys/v2020_7"]
-v2020_8 = ["v2020_7", "ostree-sys/v2020_8"]
-v2021_1 = ["v2020_8", "ostree-sys/v2021_1"]
-v2021_2 = ["v2020_1", "ostree-sys/v2021_2"]
+dox = ["ffi/dox"]
+v2014_9 = ["ffi/v2014_9"]
+v2015_7 = ["v2014_9", "ffi/v2015_7"]
+v2016_3 = ["v2015_7", "ffi/v2016_3"]
+v2016_4 = ["v2015_7", "ffi/v2016_4"]
+v2016_5 = ["v2016_4", "ffi/v2016_5"]
+v2016_6 = ["v2016_5", "ffi/v2016_6"]
+v2016_7 = ["v2016_6", "ffi/v2016_7"]
+v2016_8 = ["v2016_7", "ffi/v2016_8"]
+v2016_14 = ["v2016_8", "ffi/v2016_14"]
+v2017_1 = ["v2016_14", "ffi/v2017_1"]
+v2017_2 = ["v2017_1", "ffi/v2017_2"]
+v2017_3 = ["v2017_2", "ffi/v2017_3"]
+v2017_4 = ["v2017_3", "ffi/v2017_4"]
+v2017_6 = ["v2017_4", "ffi/v2017_6"]
+v2017_7 = ["v2017_6", "ffi/v2017_7"]
+v2017_8 = ["v2017_7", "ffi/v2017_8"]
+v2017_9 = ["v2017_8", "ffi/v2017_9"]
+v2017_10 = ["v2017_9", "ffi/v2017_10"]
+v2017_11 = ["v2017_10", "ffi/v2017_11"]
+v2017_12 = ["v2017_11", "ffi/v2017_12"]
+v2017_13 = ["v2017_12", "ffi/v2017_13"]
+v2017_15 = ["v2017_13", "ffi/v2017_15"]
+v2018_2 = ["v2017_15", "ffi/v2018_2"]
+v2018_3 = ["v2018_2", "ffi/v2018_3"]
+v2018_5 = ["v2018_3", "ffi/v2018_5"]
+v2018_6 = ["v2018_5", "ffi/v2018_6"]
+v2018_7 = ["v2018_6", "ffi/v2018_7"]
+v2018_9 = ["v2018_7", "ffi/v2018_9"]
+v2019_2 = ["v2018_9", "ffi/v2019_2"]
+v2019_3 = ["v2019_2", "ffi/v2019_3"]
+v2019_4 = ["v2019_3", "ffi/v2019_4"]
+v2019_6 = ["v2019_4", "ffi/v2019_6"]
+v2020_1 = ["v2019_6", "ffi/v2020_1"]
+v2020_2 = ["v2020_1", "ffi/v2020_2"]
+v2020_4 = ["v2020_2", "ffi/v2020_4"]
+v2020_7 = ["v2020_4", "ffi/v2020_7"]
+v2020_8 = ["v2020_7", "ffi/v2020_8"]
+v2021_1 = ["v2020_8", "ffi/v2021_1"]
+v2021_2 = ["v2020_1", "ffi/v2021_2"]
index 621f2260013f08bf3b8a230bdde9ff3220525164..0606c7abd01bead724fdd574315e3ee2d6606ab5 100644 (file)
@@ -1,5 +1,5 @@
 GIR_REPO := https://github.com/gtk-rs/gir.git
-GIR_VERSION := 2d1ffab19eb5f9a2f0d7a294dbf07517dab4d989
+GIR_VERSION := e8f82cf63f2b2fba7af9440248510c4b7e5ab787
 OSTREE_REPO := ../ostree
 OSTREE_VERSION := patch-v2021.1
 RUSTDOC_STRIPPER_VERSION := 0.1.17
index 77a01f951c2d1ca9449793728d0d903c7c257375..f5f664db0c96537e969afcd04b8e3d9c8059ac35 100644 (file)
@@ -36,4 +36,4 @@ ignore = [
     "OSTree.BUILT_FEATURES",
 ]
 
-girs_dir = "../gir-files"
+girs_directories = [ "../gir-files" ]
index 51189ebbe2659a9308d9110246a7d2cee9bbf420..0e9611ffd44fe796c018452f43b33fe552ec5973 100644 (file)
@@ -13,7 +13,7 @@ deprecate_by_min_version = true
 single_version_file = true
 generate_display_trait = true
 
-girs_dir = "../gir-files"
+girs_directories = [ "../gir-files" ]
 
 generate = [
     "OSTree.AsyncProgress",
@@ -225,6 +225,11 @@ status = "generate"
     name = "opts"
     const = true
 
+    [[object.function]]
+    # [IGNORE] overlaps with repo()
+    name = "get_repo"
+    ignore = true
+
 [[object]]
 name = "OSTree.*"
 status = "generate"
index 2049a14f17cefaabdbea1f68e4f91825ad0830b3..f6040441d83da000d3b082eb64a7564f0b33c723 100644 (file)
 // This file was generated by gir (https://github.com/gtk-rs/gir)
-// from gir-files (https://github.com/gtk-rs/gir-files)
+// from gir-files
 // DO NOT EDIT
 
-#[cfg(any(feature = "v2017_6", feature = "dox"))]
-use glib;
-use glib::object::Cast;
-use glib::object::IsA;
+use glib::object::ObjectType as ObjectType_;
 use glib::signal::connect_raw;
 use glib::signal::SignalHandlerId;
 use glib::translate::*;
-#[cfg(any(feature = "v2017_6", feature = "dox"))]
-use glib::GString;
-use glib_sys;
-use ostree_sys;
 use std::boxed::Box as Box_;
 use std::fmt;
 use std::mem::transmute;
 
-glib_wrapper! {
-    pub struct AsyncProgress(Object<ostree_sys::OstreeAsyncProgress, ostree_sys::OstreeAsyncProgressClass, AsyncProgressClass>);
+glib::wrapper! {
+    #[doc(alias = "OstreeAsyncProgress")]
+    pub struct AsyncProgress(Object<ffi::OstreeAsyncProgress, ffi::OstreeAsyncProgressClass>);
 
     match fn {
-        get_type => || ostree_sys::ostree_async_progress_get_type(),
+        type_ => || ffi::ostree_async_progress_get_type(),
     }
 }
 
 impl AsyncProgress {
+    #[doc(alias = "ostree_async_progress_new")]
     pub fn new() -> AsyncProgress {
         unsafe {
-            from_glib_full(ostree_sys::ostree_async_progress_new())
+            from_glib_full(ffi::ostree_async_progress_new())
         }
     }
 
+    //#[doc(alias = "ostree_async_progress_new_and_connect")]
     //pub fn new_and_connect(changed: /*Unimplemented*/Option<Fundamental: Pointer>, user_data: /*Unimplemented*/Option<Fundamental: Pointer>) -> AsyncProgress {
-    //    unsafe { TODO: call ostree_sys:ostree_async_progress_new_and_connect() }
+    //    unsafe { TODO: call ffi:ostree_async_progress_new_and_connect() }
     //}
-}
 
-impl Default for AsyncProgress {
-    fn default() -> Self {
-        Self::new()
-    }
-}
-
-pub const NONE_ASYNC_PROGRESS: Option<&AsyncProgress> = None;
-
-pub trait AsyncProgressExt: 'static {
     #[cfg(any(feature = "v2019_6", feature = "dox"))]
-    fn copy_state<P: IsA<AsyncProgress>>(&self, dest: &P);
-
-    fn finish(&self);
-
-    //#[cfg(any(feature = "v2017_6", feature = "dox"))]
-    //fn get(&self, : /*Unknown conversion*//*Unimplemented*/Fundamental: VarArgs);
-
-    #[cfg(any(feature = "v2017_6", feature = "dox"))]
-    fn get_status(&self) -> Option<GString>;
-
-    fn get_uint(&self, key: &str) -> u32;
-
-    fn get_uint64(&self, key: &str) -> u64;
-
-    #[cfg(any(feature = "v2017_6", feature = "dox"))]
-    fn get_variant(&self, key: &str) -> Option<glib::Variant>;
-
-    //#[cfg(any(feature = "v2017_6", feature = "dox"))]
-    //fn set(&self, : /*Unknown conversion*//*Unimplemented*/Fundamental: VarArgs);
-
-    #[cfg(any(feature = "v2017_6", feature = "dox"))]
-    fn set_status(&self, status: Option<&str>);
-
-    fn set_uint(&self, key: &str, value: u32);
-
-    fn set_uint64(&self, key: &str, value: u64);
-
-    #[cfg(any(feature = "v2017_6", feature = "dox"))]
-    fn set_variant(&self, key: &str, value: &glib::Variant);
-
-    fn connect_changed<F: Fn(&Self) + 'static>(&self, f: F) -> SignalHandlerId;
-}
-
-impl<O: IsA<AsyncProgress>> AsyncProgressExt for O {
-    #[cfg(any(feature = "v2019_6", feature = "dox"))]
-    fn copy_state<P: IsA<AsyncProgress>>(&self, dest: &P) {
+    #[cfg_attr(feature = "dox", doc(cfg(feature = "v2019_6")))]
+    #[doc(alias = "ostree_async_progress_copy_state")]
+    pub fn copy_state(&self, dest: &AsyncProgress) {
         unsafe {
-            ostree_sys::ostree_async_progress_copy_state(self.as_ref().to_glib_none().0, dest.as_ref().to_glib_none().0);
+            ffi::ostree_async_progress_copy_state(self.to_glib_none().0, dest.to_glib_none().0);
         }
     }
 
-    fn finish(&self) {
+    #[doc(alias = "ostree_async_progress_finish")]
+    pub fn finish(&self) {
         unsafe {
-            ostree_sys::ostree_async_progress_finish(self.as_ref().to_glib_none().0);
+            ffi::ostree_async_progress_finish(self.to_glib_none().0);
         }
     }
 
     //#[cfg(any(feature = "v2017_6", feature = "dox"))]
-    //fn get(&self, : /*Unknown conversion*//*Unimplemented*/Fundamental: VarArgs) {
-    //    unsafe { TODO: call ostree_sys:ostree_async_progress_get() }
+    //#[cfg_attr(feature = "dox", doc(cfg(feature = "v2017_6")))]
+    //#[doc(alias = "ostree_async_progress_get")]
+    //pub fn get(&self, : /*Unknown conversion*//*Unimplemented*/Fundamental: VarArgs) {
+    //    unsafe { TODO: call ffi:ostree_async_progress_get() }
     //}
 
     #[cfg(any(feature = "v2017_6", feature = "dox"))]
-    fn get_status(&self) -> Option<GString> {
+    #[cfg_attr(feature = "dox", doc(cfg(feature = "v2017_6")))]
+    #[doc(alias = "ostree_async_progress_get_status")]
+    #[doc(alias = "get_status")]
+    pub fn status(&self) -> Option<glib::GString> {
         unsafe {
-            from_glib_full(ostree_sys::ostree_async_progress_get_status(self.as_ref().to_glib_none().0))
+            from_glib_full(ffi::ostree_async_progress_get_status(self.to_glib_none().0))
         }
     }
 
-    fn get_uint(&self, key: &str) -> u32 {
+    #[doc(alias = "ostree_async_progress_get_uint")]
+    #[doc(alias = "get_uint")]
+    pub fn uint(&self, key: &str) -> u32 {
         unsafe {
-            ostree_sys::ostree_async_progress_get_uint(self.as_ref().to_glib_none().0, key.to_glib_none().0)
+            ffi::ostree_async_progress_get_uint(self.to_glib_none().0, key.to_glib_none().0)
         }
     }
 
-    fn get_uint64(&self, key: &str) -> u64 {
+    #[doc(alias = "ostree_async_progress_get_uint64")]
+    #[doc(alias = "get_uint64")]
+    pub fn uint64(&self, key: &str) -> u64 {
         unsafe {
-            ostree_sys::ostree_async_progress_get_uint64(self.as_ref().to_glib_none().0, key.to_glib_none().0)
+            ffi::ostree_async_progress_get_uint64(self.to_glib_none().0, key.to_glib_none().0)
         }
     }
 
     #[cfg(any(feature = "v2017_6", feature = "dox"))]
-    fn get_variant(&self, key: &str) -> Option<glib::Variant> {
+    #[cfg_attr(feature = "dox", doc(cfg(feature = "v2017_6")))]
+    #[doc(alias = "ostree_async_progress_get_variant")]
+    #[doc(alias = "get_variant")]
+    pub fn variant(&self, key: &str) -> Option<glib::Variant> {
         unsafe {
-            from_glib_full(ostree_sys::ostree_async_progress_get_variant(self.as_ref().to_glib_none().0, key.to_glib_none().0))
+            from_glib_full(ffi::ostree_async_progress_get_variant(self.to_glib_none().0, key.to_glib_none().0))
         }
     }
 
     //#[cfg(any(feature = "v2017_6", feature = "dox"))]
-    //fn set(&self, : /*Unknown conversion*//*Unimplemented*/Fundamental: VarArgs) {
-    //    unsafe { TODO: call ostree_sys:ostree_async_progress_set() }
+    //#[cfg_attr(feature = "dox", doc(cfg(feature = "v2017_6")))]
+    //#[doc(alias = "ostree_async_progress_set")]
+    //pub fn set(&self, : /*Unknown conversion*//*Unimplemented*/Fundamental: VarArgs) {
+    //    unsafe { TODO: call ffi:ostree_async_progress_set() }
     //}
 
     #[cfg(any(feature = "v2017_6", feature = "dox"))]
-    fn set_status(&self, status: Option<&str>) {
+    #[cfg_attr(feature = "dox", doc(cfg(feature = "v2017_6")))]
+    #[doc(alias = "ostree_async_progress_set_status")]
+    pub fn set_status(&self, status: Option<&str>) {
         unsafe {
-            ostree_sys::ostree_async_progress_set_status(self.as_ref().to_glib_none().0, status.to_glib_none().0);
+            ffi::ostree_async_progress_set_status(self.to_glib_none().0, status.to_glib_none().0);
         }
     }
 
-    fn set_uint(&self, key: &str, value: u32) {
+    #[doc(alias = "ostree_async_progress_set_uint")]
+    pub fn set_uint(&self, key: &str, value: u32) {
         unsafe {
-            ostree_sys::ostree_async_progress_set_uint(self.as_ref().to_glib_none().0, key.to_glib_none().0, value);
+            ffi::ostree_async_progress_set_uint(self.to_glib_none().0, key.to_glib_none().0, value);
         }
     }
 
-    fn set_uint64(&self, key: &str, value: u64) {
+    #[doc(alias = "ostree_async_progress_set_uint64")]
+    pub fn set_uint64(&self, key: &str, value: u64) {
         unsafe {
-            ostree_sys::ostree_async_progress_set_uint64(self.as_ref().to_glib_none().0, key.to_glib_none().0, value);
+            ffi::ostree_async_progress_set_uint64(self.to_glib_none().0, key.to_glib_none().0, value);
         }
     }
 
     #[cfg(any(feature = "v2017_6", feature = "dox"))]
-    fn set_variant(&self, key: &str, value: &glib::Variant) {
+    #[cfg_attr(feature = "dox", doc(cfg(feature = "v2017_6")))]
+    #[doc(alias = "ostree_async_progress_set_variant")]
+    pub fn set_variant(&self, key: &str, value: &glib::Variant) {
         unsafe {
-            ostree_sys::ostree_async_progress_set_variant(self.as_ref().to_glib_none().0, key.to_glib_none().0, value.to_glib_none().0);
+            ffi::ostree_async_progress_set_variant(self.to_glib_none().0, key.to_glib_none().0, value.to_glib_none().0);
         }
     }
 
-    fn connect_changed<F: Fn(&Self) + 'static>(&self, f: F) -> SignalHandlerId {
-        unsafe extern "C" fn changed_trampoline<P, F: Fn(&P) + 'static>(this: *mut ostree_sys::OstreeAsyncProgress, f: glib_sys::gpointer)
-            where P: IsA<AsyncProgress>
-        {
+    #[doc(alias = "changed")]
+    pub fn connect_changed<F: Fn(&Self) + 'static>(&self, f: F) -> SignalHandlerId {
+        unsafe extern "C" fn changed_trampoline<F: Fn(&AsyncProgress) + 'static>(this: *mut ffi::OstreeAsyncProgress, f: glib::ffi::gpointer) {
             let f: &F = &*(f as *const F);
-            f(&AsyncProgress::from_glib_borrow(this).unsafe_cast_ref())
+            f(&from_glib_borrow(this))
         }
         unsafe {
             let f: Box_<F> = Box_::new(f);
             connect_raw(self.as_ptr() as *mut _, b"changed\0".as_ptr() as *const _,
-                Some(transmute::<_, unsafe extern "C" fn()>(changed_trampoline::<Self, F> as *const ())), Box_::into_raw(f))
+                Some(transmute::<_, unsafe extern "C" fn()>(changed_trampoline::<F> as *const ())), Box_::into_raw(f))
         }
     }
 }
 
+impl Default for AsyncProgress {
+    fn default() -> Self {
+        Self::new()
+    }
+}
+
 impl fmt::Display for AsyncProgress {
     fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        write!(f, "AsyncProgress")
+        f.write_str("AsyncProgress")
     }
 }
index 43be2dabc2062f5b2c9ad07963a95b0ae55bd1ef..a19a4127bd49340a48a8b1fab46ec2386d34ccfd 100644 (file)
 // This file was generated by gir (https://github.com/gtk-rs/gir)
-// from gir-files (https://github.com/gtk-rs/gir-files)
+// from gir-files
 // DO NOT EDIT
 
-use gio;
-use glib;
 use glib::object::IsA;
 use glib::translate::*;
-use glib::GString;
-use ostree_sys;
 use std::fmt;
 use std::ptr;
 
-glib_wrapper! {
-    pub struct BootconfigParser(Object<ostree_sys::OstreeBootconfigParser, BootconfigParserClass>);
+glib::wrapper! {
+    #[doc(alias = "OstreeBootconfigParser")]
+    pub struct BootconfigParser(Object<ffi::OstreeBootconfigParser>);
 
     match fn {
-        get_type => || ostree_sys::ostree_bootconfig_parser_get_type(),
+        type_ => || ffi::ostree_bootconfig_parser_get_type(),
     }
 }
 
 impl BootconfigParser {
+    #[doc(alias = "ostree_bootconfig_parser_new")]
     pub fn new() -> BootconfigParser {
         unsafe {
-            from_glib_full(ostree_sys::ostree_bootconfig_parser_new())
+            from_glib_full(ffi::ostree_bootconfig_parser_new())
         }
     }
 
+    #[doc(alias = "ostree_bootconfig_parser_clone")]
     pub fn clone(&self) -> Option<BootconfigParser> {
         unsafe {
-            from_glib_full(ostree_sys::ostree_bootconfig_parser_clone(self.to_glib_none().0))
+            from_glib_full(ffi::ostree_bootconfig_parser_clone(self.to_glib_none().0))
         }
     }
 
-    pub fn get(&self, key: &str) -> Option<GString> {
+    #[doc(alias = "ostree_bootconfig_parser_get")]
+    pub fn get(&self, key: &str) -> Option<glib::GString> {
         unsafe {
-            from_glib_none(ostree_sys::ostree_bootconfig_parser_get(self.to_glib_none().0, key.to_glib_none().0))
+            from_glib_none(ffi::ostree_bootconfig_parser_get(self.to_glib_none().0, key.to_glib_none().0))
         }
     }
 
     #[cfg(any(feature = "v2020_7", feature = "dox"))]
-    pub fn get_overlay_initrds(&self) -> Vec<GString> {
+    #[cfg_attr(feature = "dox", doc(cfg(feature = "v2020_7")))]
+    #[doc(alias = "ostree_bootconfig_parser_get_overlay_initrds")]
+    #[doc(alias = "get_overlay_initrds")]
+    pub fn overlay_initrds(&self) -> Vec<glib::GString> {
         unsafe {
-            FromGlibPtrContainer::from_glib_none(ostree_sys::ostree_bootconfig_parser_get_overlay_initrds(self.to_glib_none().0))
+            FromGlibPtrContainer::from_glib_none(ffi::ostree_bootconfig_parser_get_overlay_initrds(self.to_glib_none().0))
         }
     }
 
+    #[doc(alias = "ostree_bootconfig_parser_parse")]
     pub fn parse<P: IsA<gio::File>, Q: IsA<gio::Cancellable>>(&self, path: &P, cancellable: Option<&Q>) -> Result<(), glib::Error> {
         unsafe {
             let mut error = ptr::null_mut();
-            let _ = ostree_sys::ostree_bootconfig_parser_parse(self.to_glib_none().0, path.as_ref().to_glib_none().0, cancellable.map(|p| p.as_ref()).to_glib_none().0, &mut error);
+            let _ = ffi::ostree_bootconfig_parser_parse(self.to_glib_none().0, path.as_ref().to_glib_none().0, cancellable.map(|p| p.as_ref()).to_glib_none().0, &mut error);
             if error.is_null() { Ok(()) } else { Err(from_glib_full(error)) }
         }
     }
 
+    #[doc(alias = "ostree_bootconfig_parser_parse_at")]
     pub fn parse_at<P: IsA<gio::Cancellable>>(&self, dfd: i32, path: &str, cancellable: Option<&P>) -> Result<(), glib::Error> {
         unsafe {
             let mut error = ptr::null_mut();
-            let _ = ostree_sys::ostree_bootconfig_parser_parse_at(self.to_glib_none().0, dfd, path.to_glib_none().0, cancellable.map(|p| p.as_ref()).to_glib_none().0, &mut error);
+            let _ = ffi::ostree_bootconfig_parser_parse_at(self.to_glib_none().0, dfd, path.to_glib_none().0, cancellable.map(|p| p.as_ref()).to_glib_none().0, &mut error);
             if error.is_null() { Ok(()) } else { Err(from_glib_full(error)) }
         }
     }
 
+    #[doc(alias = "ostree_bootconfig_parser_set")]
     pub fn set(&self, key: &str, value: &str) {
         unsafe {
-            ostree_sys::ostree_bootconfig_parser_set(self.to_glib_none().0, key.to_glib_none().0, value.to_glib_none().0);
+            ffi::ostree_bootconfig_parser_set(self.to_glib_none().0, key.to_glib_none().0, value.to_glib_none().0);
         }
     }
 
     #[cfg(any(feature = "v2020_7", feature = "dox"))]
+    #[cfg_attr(feature = "dox", doc(cfg(feature = "v2020_7")))]
+    #[doc(alias = "ostree_bootconfig_parser_set_overlay_initrds")]
     pub fn set_overlay_initrds(&self, initrds: &[&str]) {
         unsafe {
-            ostree_sys::ostree_bootconfig_parser_set_overlay_initrds(self.to_glib_none().0, initrds.to_glib_none().0);
+            ffi::ostree_bootconfig_parser_set_overlay_initrds(self.to_glib_none().0, initrds.to_glib_none().0);
         }
     }
 
+    #[doc(alias = "ostree_bootconfig_parser_write")]
     pub fn write<P: IsA<gio::File>, Q: IsA<gio::Cancellable>>(&self, output: &P, cancellable: Option<&Q>) -> Result<(), glib::Error> {
         unsafe {
             let mut error = ptr::null_mut();
-            let _ = ostree_sys::ostree_bootconfig_parser_write(self.to_glib_none().0, output.as_ref().to_glib_none().0, cancellable.map(|p| p.as_ref()).to_glib_none().0, &mut error);
+            let _ = ffi::ostree_bootconfig_parser_write(self.to_glib_none().0, output.as_ref().to_glib_none().0, cancellable.map(|p| p.as_ref()).to_glib_none().0, &mut error);
             if error.is_null() { Ok(()) } else { Err(from_glib_full(error)) }
         }
     }
 
+    #[doc(alias = "ostree_bootconfig_parser_write_at")]
     pub fn write_at<P: IsA<gio::Cancellable>>(&self, dfd: i32, path: &str, cancellable: Option<&P>) -> Result<(), glib::Error> {
         unsafe {
             let mut error = ptr::null_mut();
-            let _ = ostree_sys::ostree_bootconfig_parser_write_at(self.to_glib_none().0, dfd, path.to_glib_none().0, cancellable.map(|p| p.as_ref()).to_glib_none().0, &mut error);
+            let _ = ffi::ostree_bootconfig_parser_write_at(self.to_glib_none().0, dfd, path.to_glib_none().0, cancellable.map(|p| p.as_ref()).to_glib_none().0, &mut error);
             if error.is_null() { Ok(()) } else { Err(from_glib_full(error)) }
         }
     }
@@ -99,6 +109,6 @@ impl Default for BootconfigParser {
 
 impl fmt::Display for BootconfigParser {
     fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        write!(f, "BootconfigParser")
+        f.write_str("BootconfigParser")
     }
 }
index 47c092eb8e584c717042feacd71a43f68f3cc185..c6f8cd4cf67f9603f7e9a293aed88264312b2b5a 100644 (file)
@@ -1,45 +1,40 @@
 // This file was generated by gir (https://github.com/gtk-rs/gir)
-// from gir-files (https://github.com/gtk-rs/gir-files)
+// from gir-files
 // DO NOT EDIT
 
-#[cfg(any(feature = "v2018_6", feature = "dox"))]
 use glib::translate::*;
-#[cfg(any(feature = "v2018_6", feature = "dox"))]
-use glib_sys;
-use gobject_sys;
-use ostree_sys;
 use std::hash;
 
-glib_wrapper! {
+glib::wrapper! {
     #[derive(Debug, PartialOrd, Ord)]
-    pub struct CollectionRef(Boxed<ostree_sys::OstreeCollectionRef>);
+    pub struct CollectionRef(Boxed<ffi::OstreeCollectionRef>);
 
     match fn {
-        copy => |ptr| gobject_sys::g_boxed_copy(ostree_sys::ostree_collection_ref_get_type(), ptr as *mut _) as *mut ostree_sys::OstreeCollectionRef,
-        free => |ptr| gobject_sys::g_boxed_free(ostree_sys::ostree_collection_ref_get_type(), ptr as *mut _),
-        get_type => || ostree_sys::ostree_collection_ref_get_type(),
+        copy => |ptr| glib::gobject_ffi::g_boxed_copy(ffi::ostree_collection_ref_get_type(), ptr as *mut _) as *mut ffi::OstreeCollectionRef,
+        free => |ptr| glib::gobject_ffi::g_boxed_free(ffi::ostree_collection_ref_get_type(), ptr as *mut _),
+        type_ => || ffi::ostree_collection_ref_get_type(),
     }
 }
 
 impl CollectionRef {
-    #[cfg(any(feature = "v2018_6", feature = "dox"))]
+    #[doc(alias = "ostree_collection_ref_new")]
     pub fn new(collection_id: Option<&str>, ref_name: &str) -> Option<CollectionRef> {
         unsafe {
-            from_glib_full(ostree_sys::ostree_collection_ref_new(collection_id.to_glib_none().0, ref_name.to_glib_none().0))
+            from_glib_full(ffi::ostree_collection_ref_new(collection_id.to_glib_none().0, ref_name.to_glib_none().0))
         }
     }
 
-    #[cfg(any(feature = "v2018_6", feature = "dox"))]
+    #[doc(alias = "ostree_collection_ref_equal")]
     fn equal(&self, ref2: &CollectionRef) -> bool {
         unsafe {
-            from_glib(ostree_sys::ostree_collection_ref_equal(ToGlibPtr::<*const ostree_sys::OstreeCollectionRef>::to_glib_none(self).0 as glib_sys::gconstpointer, ToGlibPtr::<*const ostree_sys::OstreeCollectionRef>::to_glib_none(ref2).0 as glib_sys::gconstpointer))
+            from_glib(ffi::ostree_collection_ref_equal(ToGlibPtr::<*const ffi::OstreeCollectionRef>::to_glib_none(self).0 as glib::ffi::gconstpointer, ToGlibPtr::<*const ffi::OstreeCollectionRef>::to_glib_none(ref2).0 as glib::ffi::gconstpointer))
         }
     }
 
-    #[cfg(any(feature = "v2018_6", feature = "dox"))]
+    #[doc(alias = "ostree_collection_ref_hash")]
     fn hash(&self) -> u32 {
         unsafe {
-            ostree_sys::ostree_collection_ref_hash(ToGlibPtr::<*const ostree_sys::OstreeCollectionRef>::to_glib_none(self).0 as glib_sys::gconstpointer)
+            ffi::ostree_collection_ref_hash(ToGlibPtr::<*const ffi::OstreeCollectionRef>::to_glib_none(self).0 as glib::ffi::gconstpointer)
         }
     }
 }
index 0dc8691206a41b29ca5091105e304af110fa6bb7..c52ecc5c6e05b2090099866409ca9a00078c42a3 100644 (file)
@@ -1,29 +1,26 @@
 // This file was generated by gir (https://github.com/gtk-rs/gir)
-// from gir-files (https://github.com/gtk-rs/gir-files)
+// from gir-files
 // DO NOT EDIT
 
-#[cfg(any(feature = "v2020_1", feature = "dox"))]
+use crate::ObjectType;
 use glib::translate::*;
-use ostree_sys;
-#[cfg(any(feature = "v2020_1", feature = "dox"))]
-use ObjectType;
 
-glib_wrapper! {
+glib::wrapper! {
     #[derive(Debug, PartialEq, Eq, PartialOrd, Ord, Hash)]
-    pub struct CommitSizesEntry(Boxed<ostree_sys::OstreeCommitSizesEntry>);
+    pub struct CommitSizesEntry(Boxed<ffi::OstreeCommitSizesEntry>);
 
     match fn {
-        copy => |ptr| ostree_sys::ostree_commit_sizes_entry_copy(mut_override(ptr)),
-        free => |ptr| ostree_sys::ostree_commit_sizes_entry_free(ptr),
-        get_type => || ostree_sys::ostree_commit_sizes_entry_get_type(),
+        copy => |ptr| ffi::ostree_commit_sizes_entry_copy(ptr),
+        free => |ptr| ffi::ostree_commit_sizes_entry_free(ptr),
+        type_ => || ffi::ostree_commit_sizes_entry_get_type(),
     }
 }
 
 impl CommitSizesEntry {
-    #[cfg(any(feature = "v2020_1", feature = "dox"))]
+    #[doc(alias = "ostree_commit_sizes_entry_new")]
     pub fn new(checksum: &str, objtype: ObjectType, unpacked: u64, archived: u64) -> Option<CommitSizesEntry> {
         unsafe {
-            from_glib_full(ostree_sys::ostree_commit_sizes_entry_new(checksum.to_glib_none().0, objtype.to_glib(), unpacked, archived))
+            from_glib_full(ffi::ostree_commit_sizes_entry_new(checksum.to_glib_none().0, objtype.into_glib(), unpacked, archived))
         }
     }
 }
index 8cb838ed28c936b0c36e02d14c91e5b760745e70..b68c8fd38adfe1336b0080c810fd39f22e78b3be 100644 (file)
@@ -1,39 +1,70 @@
 // This file was generated by gir (https://github.com/gtk-rs/gir)
-// from gir-files (https://github.com/gtk-rs/gir-files)
+// from gir-files
 // DO NOT EDIT
 
-use ostree_sys;
 use std::ffi::CStr;
 
-pub static COMMIT_GVARIANT_STRING: once_cell::sync::Lazy<&'static str> = once_cell::sync::Lazy::new(|| unsafe{CStr::from_ptr(ostree_sys::OSTREE_COMMIT_GVARIANT_STRING).to_str().unwrap()});
+#[doc(alias = "OSTREE_COMMIT_GVARIANT_STRING")]
+pub static COMMIT_GVARIANT_STRING: once_cell::sync::Lazy<&'static str> = once_cell::sync::Lazy::new(|| unsafe{CStr::from_ptr(ffi::OSTREE_COMMIT_GVARIANT_STRING).to_str().unwrap()});
 #[cfg(any(feature = "v2020_4", feature = "dox"))]
-pub static COMMIT_META_KEY_ARCHITECTURE: once_cell::sync::Lazy<&'static str> = once_cell::sync::Lazy::new(|| unsafe{CStr::from_ptr(ostree_sys::OSTREE_COMMIT_META_KEY_ARCHITECTURE).to_str().unwrap()});
+#[cfg_attr(feature = "dox", doc(cfg(feature = "v2020_4")))]
+#[doc(alias = "OSTREE_COMMIT_META_KEY_ARCHITECTURE")]
+pub static COMMIT_META_KEY_ARCHITECTURE: once_cell::sync::Lazy<&'static str> = once_cell::sync::Lazy::new(|| unsafe{CStr::from_ptr(ffi::OSTREE_COMMIT_META_KEY_ARCHITECTURE).to_str().unwrap()});
 #[cfg(any(feature = "v2018_6", feature = "dox"))]
-pub static COMMIT_META_KEY_COLLECTION_BINDING: once_cell::sync::Lazy<&'static str> = once_cell::sync::Lazy::new(|| unsafe{CStr::from_ptr(ostree_sys::OSTREE_COMMIT_META_KEY_COLLECTION_BINDING).to_str().unwrap()});
+#[cfg_attr(feature = "dox", doc(cfg(feature = "v2018_6")))]
+#[doc(alias = "OSTREE_COMMIT_META_KEY_COLLECTION_BINDING")]
+pub static COMMIT_META_KEY_COLLECTION_BINDING: once_cell::sync::Lazy<&'static str> = once_cell::sync::Lazy::new(|| unsafe{CStr::from_ptr(ffi::OSTREE_COMMIT_META_KEY_COLLECTION_BINDING).to_str().unwrap()});
 #[cfg(any(feature = "v2017_7", feature = "dox"))]
-pub static COMMIT_META_KEY_ENDOFLIFE: once_cell::sync::Lazy<&'static str> = once_cell::sync::Lazy::new(|| unsafe{CStr::from_ptr(ostree_sys::OSTREE_COMMIT_META_KEY_ENDOFLIFE).to_str().unwrap()});
+#[cfg_attr(feature = "dox", doc(cfg(feature = "v2017_7")))]
+#[doc(alias = "OSTREE_COMMIT_META_KEY_ENDOFLIFE")]
+pub static COMMIT_META_KEY_ENDOFLIFE: once_cell::sync::Lazy<&'static str> = once_cell::sync::Lazy::new(|| unsafe{CStr::from_ptr(ffi::OSTREE_COMMIT_META_KEY_ENDOFLIFE).to_str().unwrap()});
 #[cfg(any(feature = "v2017_7", feature = "dox"))]
-pub static COMMIT_META_KEY_ENDOFLIFE_REBASE: once_cell::sync::Lazy<&'static str> = once_cell::sync::Lazy::new(|| unsafe{CStr::from_ptr(ostree_sys::OSTREE_COMMIT_META_KEY_ENDOFLIFE_REBASE).to_str().unwrap()});
+#[cfg_attr(feature = "dox", doc(cfg(feature = "v2017_7")))]
+#[doc(alias = "OSTREE_COMMIT_META_KEY_ENDOFLIFE_REBASE")]
+pub static COMMIT_META_KEY_ENDOFLIFE_REBASE: once_cell::sync::Lazy<&'static str> = once_cell::sync::Lazy::new(|| unsafe{CStr::from_ptr(ffi::OSTREE_COMMIT_META_KEY_ENDOFLIFE_REBASE).to_str().unwrap()});
 #[cfg(any(feature = "v2017_9", feature = "dox"))]
-pub static COMMIT_META_KEY_REF_BINDING: once_cell::sync::Lazy<&'static str> = once_cell::sync::Lazy::new(|| unsafe{CStr::from_ptr(ostree_sys::OSTREE_COMMIT_META_KEY_REF_BINDING).to_str().unwrap()});
+#[cfg_attr(feature = "dox", doc(cfg(feature = "v2017_9")))]
+#[doc(alias = "OSTREE_COMMIT_META_KEY_REF_BINDING")]
+pub static COMMIT_META_KEY_REF_BINDING: once_cell::sync::Lazy<&'static str> = once_cell::sync::Lazy::new(|| unsafe{CStr::from_ptr(ffi::OSTREE_COMMIT_META_KEY_REF_BINDING).to_str().unwrap()});
 #[cfg(any(feature = "v2017_13", feature = "dox"))]
-pub static COMMIT_META_KEY_SOURCE_TITLE: once_cell::sync::Lazy<&'static str> = once_cell::sync::Lazy::new(|| unsafe{CStr::from_ptr(ostree_sys::OSTREE_COMMIT_META_KEY_SOURCE_TITLE).to_str().unwrap()});
+#[cfg_attr(feature = "dox", doc(cfg(feature = "v2017_13")))]
+#[doc(alias = "OSTREE_COMMIT_META_KEY_SOURCE_TITLE")]
+pub static COMMIT_META_KEY_SOURCE_TITLE: once_cell::sync::Lazy<&'static str> = once_cell::sync::Lazy::new(|| unsafe{CStr::from_ptr(ffi::OSTREE_COMMIT_META_KEY_SOURCE_TITLE).to_str().unwrap()});
 #[cfg(any(feature = "v2014_9", feature = "dox"))]
-pub static COMMIT_META_KEY_VERSION: once_cell::sync::Lazy<&'static str> = once_cell::sync::Lazy::new(|| unsafe{CStr::from_ptr(ostree_sys::OSTREE_COMMIT_META_KEY_VERSION).to_str().unwrap()});
-pub static DIRMETA_GVARIANT_STRING: once_cell::sync::Lazy<&'static str> = once_cell::sync::Lazy::new(|| unsafe{CStr::from_ptr(ostree_sys::OSTREE_DIRMETA_GVARIANT_STRING).to_str().unwrap()});
-pub static FILEMETA_GVARIANT_STRING: once_cell::sync::Lazy<&'static str> = once_cell::sync::Lazy::new(|| unsafe{CStr::from_ptr(ostree_sys::OSTREE_FILEMETA_GVARIANT_STRING).to_str().unwrap()});
+#[cfg_attr(feature = "dox", doc(cfg(feature = "v2014_9")))]
+#[doc(alias = "OSTREE_COMMIT_META_KEY_VERSION")]
+pub static COMMIT_META_KEY_VERSION: once_cell::sync::Lazy<&'static str> = once_cell::sync::Lazy::new(|| unsafe{CStr::from_ptr(ffi::OSTREE_COMMIT_META_KEY_VERSION).to_str().unwrap()});
+#[doc(alias = "OSTREE_DIRMETA_GVARIANT_STRING")]
+pub static DIRMETA_GVARIANT_STRING: once_cell::sync::Lazy<&'static str> = once_cell::sync::Lazy::new(|| unsafe{CStr::from_ptr(ffi::OSTREE_DIRMETA_GVARIANT_STRING).to_str().unwrap()});
+#[doc(alias = "OSTREE_FILEMETA_GVARIANT_STRING")]
+pub static FILEMETA_GVARIANT_STRING: once_cell::sync::Lazy<&'static str> = once_cell::sync::Lazy::new(|| unsafe{CStr::from_ptr(ffi::OSTREE_FILEMETA_GVARIANT_STRING).to_str().unwrap()});
 #[cfg(any(feature = "v2021_1", feature = "dox"))]
-pub static METADATA_KEY_BOOTABLE: once_cell::sync::Lazy<&'static str> = once_cell::sync::Lazy::new(|| unsafe{CStr::from_ptr(ostree_sys::OSTREE_METADATA_KEY_BOOTABLE).to_str().unwrap()});
+#[cfg_attr(feature = "dox", doc(cfg(feature = "v2021_1")))]
+#[doc(alias = "OSTREE_METADATA_KEY_BOOTABLE")]
+pub static METADATA_KEY_BOOTABLE: once_cell::sync::Lazy<&'static str> = once_cell::sync::Lazy::new(|| unsafe{CStr::from_ptr(ffi::OSTREE_METADATA_KEY_BOOTABLE).to_str().unwrap()});
 #[cfg(any(feature = "v2021_1", feature = "dox"))]
-pub static METADATA_KEY_LINUX: once_cell::sync::Lazy<&'static str> = once_cell::sync::Lazy::new(|| unsafe{CStr::from_ptr(ostree_sys::OSTREE_METADATA_KEY_LINUX).to_str().unwrap()});
+#[cfg_attr(feature = "dox", doc(cfg(feature = "v2021_1")))]
+#[doc(alias = "OSTREE_METADATA_KEY_LINUX")]
+pub static METADATA_KEY_LINUX: once_cell::sync::Lazy<&'static str> = once_cell::sync::Lazy::new(|| unsafe{CStr::from_ptr(ffi::OSTREE_METADATA_KEY_LINUX).to_str().unwrap()});
 #[cfg(any(feature = "v2018_9", feature = "dox"))]
-pub static META_KEY_DEPLOY_COLLECTION_ID: once_cell::sync::Lazy<&'static str> = once_cell::sync::Lazy::new(|| unsafe{CStr::from_ptr(ostree_sys::OSTREE_META_KEY_DEPLOY_COLLECTION_ID).to_str().unwrap()});
+#[cfg_attr(feature = "dox", doc(cfg(feature = "v2018_9")))]
+#[doc(alias = "OSTREE_META_KEY_DEPLOY_COLLECTION_ID")]
+pub static META_KEY_DEPLOY_COLLECTION_ID: once_cell::sync::Lazy<&'static str> = once_cell::sync::Lazy::new(|| unsafe{CStr::from_ptr(ffi::OSTREE_META_KEY_DEPLOY_COLLECTION_ID).to_str().unwrap()});
 #[cfg(any(feature = "v2018_3", feature = "dox"))]
-pub static ORIGIN_TRANSIENT_GROUP: once_cell::sync::Lazy<&'static str> = once_cell::sync::Lazy::new(|| unsafe{CStr::from_ptr(ostree_sys::OSTREE_ORIGIN_TRANSIENT_GROUP).to_str().unwrap()});
+#[cfg_attr(feature = "dox", doc(cfg(feature = "v2018_3")))]
+#[doc(alias = "OSTREE_ORIGIN_TRANSIENT_GROUP")]
+pub static ORIGIN_TRANSIENT_GROUP: once_cell::sync::Lazy<&'static str> = once_cell::sync::Lazy::new(|| unsafe{CStr::from_ptr(ffi::OSTREE_ORIGIN_TRANSIENT_GROUP).to_str().unwrap()});
 #[cfg(any(feature = "v2018_6", feature = "dox"))]
-pub static REPO_METADATA_REF: once_cell::sync::Lazy<&'static str> = once_cell::sync::Lazy::new(|| unsafe{CStr::from_ptr(ostree_sys::OSTREE_REPO_METADATA_REF).to_str().unwrap()});
+#[cfg_attr(feature = "dox", doc(cfg(feature = "v2018_6")))]
+#[doc(alias = "OSTREE_REPO_METADATA_REF")]
+pub static REPO_METADATA_REF: once_cell::sync::Lazy<&'static str> = once_cell::sync::Lazy::new(|| unsafe{CStr::from_ptr(ffi::OSTREE_REPO_METADATA_REF).to_str().unwrap()});
 #[cfg(any(feature = "v2020_4", feature = "dox"))]
-pub static SIGN_NAME_ED25519: once_cell::sync::Lazy<&'static str> = once_cell::sync::Lazy::new(|| unsafe{CStr::from_ptr(ostree_sys::OSTREE_SIGN_NAME_ED25519).to_str().unwrap()});
-pub static SUMMARY_GVARIANT_STRING: once_cell::sync::Lazy<&'static str> = once_cell::sync::Lazy::new(|| unsafe{CStr::from_ptr(ostree_sys::OSTREE_SUMMARY_GVARIANT_STRING).to_str().unwrap()});
-pub static SUMMARY_SIG_GVARIANT_STRING: once_cell::sync::Lazy<&'static str> = once_cell::sync::Lazy::new(|| unsafe{CStr::from_ptr(ostree_sys::OSTREE_SUMMARY_SIG_GVARIANT_STRING).to_str().unwrap()});
-pub static TREE_GVARIANT_STRING: once_cell::sync::Lazy<&'static str> = once_cell::sync::Lazy::new(|| unsafe{CStr::from_ptr(ostree_sys::OSTREE_TREE_GVARIANT_STRING).to_str().unwrap()});
+#[cfg_attr(feature = "dox", doc(cfg(feature = "v2020_4")))]
+#[doc(alias = "OSTREE_SIGN_NAME_ED25519")]
+pub static SIGN_NAME_ED25519: once_cell::sync::Lazy<&'static str> = once_cell::sync::Lazy::new(|| unsafe{CStr::from_ptr(ffi::OSTREE_SIGN_NAME_ED25519).to_str().unwrap()});
+#[doc(alias = "OSTREE_SUMMARY_GVARIANT_STRING")]
+pub static SUMMARY_GVARIANT_STRING: once_cell::sync::Lazy<&'static str> = once_cell::sync::Lazy::new(|| unsafe{CStr::from_ptr(ffi::OSTREE_SUMMARY_GVARIANT_STRING).to_str().unwrap()});
+#[doc(alias = "OSTREE_SUMMARY_SIG_GVARIANT_STRING")]
+pub static SUMMARY_SIG_GVARIANT_STRING: once_cell::sync::Lazy<&'static str> = once_cell::sync::Lazy::new(|| unsafe{CStr::from_ptr(ffi::OSTREE_SUMMARY_SIG_GVARIANT_STRING).to_str().unwrap()});
+#[doc(alias = "OSTREE_TREE_GVARIANT_STRING")]
+pub static TREE_GVARIANT_STRING: once_cell::sync::Lazy<&'static str> = once_cell::sync::Lazy::new(|| unsafe{CStr::from_ptr(ffi::OSTREE_TREE_GVARIANT_STRING).to_str().unwrap()});
index 47bb01bd478a1814638599cc83ca8dcbd071138d..5631e0027607a285484e9fa5a143c759db6a153d 100644 (file)
@@ -1,35 +1,27 @@
 // This file was generated by gir (https://github.com/gtk-rs/gir)
-// from gir-files (https://github.com/gtk-rs/gir-files)
+// from gir-files
 // DO NOT EDIT
 
-use gio;
-use glib;
 use glib::object::IsA;
 use glib::translate::*;
-use glib::GString;
-use ostree_sys;
 use std::fmt;
 use std::ptr;
 
-glib_wrapper! {
-    pub struct ContentWriter(Object<ostree_sys::OstreeContentWriter, ostree_sys::OstreeContentWriterClass, ContentWriterClass>) @extends gio::OutputStream;
+glib::wrapper! {
+    #[doc(alias = "OstreeContentWriter")]
+    pub struct ContentWriter(Object<ffi::OstreeContentWriter, ffi::OstreeContentWriterClass>) @extends gio::OutputStream;
 
     match fn {
-        get_type => || ostree_sys::ostree_content_writer_get_type(),
+        type_ => || ffi::ostree_content_writer_get_type(),
     }
 }
 
-pub const NONE_CONTENT_WRITER: Option<&ContentWriter> = None;
-
-pub trait ContentWriterExt: 'static {
-    fn finish<P: IsA<gio::Cancellable>>(&self, cancellable: Option<&P>) -> Result<GString, glib::Error>;
-}
-
-impl<O: IsA<ContentWriter>> ContentWriterExt for O {
-    fn finish<P: IsA<gio::Cancellable>>(&self, cancellable: Option<&P>) -> Result<GString, glib::Error> {
+impl ContentWriter {
+    #[doc(alias = "ostree_content_writer_finish")]
+    pub fn finish<P: IsA<gio::Cancellable>>(&self, cancellable: Option<&P>) -> Result<glib::GString, glib::Error> {
         unsafe {
             let mut error = ptr::null_mut();
-            let ret = ostree_sys::ostree_content_writer_finish(self.as_ref().to_glib_none().0, cancellable.map(|p| p.as_ref()).to_glib_none().0, &mut error);
+            let ret = ffi::ostree_content_writer_finish(self.to_glib_none().0, cancellable.map(|p| p.as_ref()).to_glib_none().0, &mut error);
             if error.is_null() { Ok(from_glib_full(ret)) } else { Err(from_glib_full(error)) }
         }
     }
@@ -37,6 +29,6 @@ impl<O: IsA<ContentWriter>> ContentWriterExt for O {
 
 impl fmt::Display for ContentWriter {
     fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        write!(f, "ContentWriter")
+        f.write_str("ContentWriter")
     }
 }
index dfd6c962b3c27dcc93d8123ea92b98c2b520f2ed..3dddaf5398212b2c00f9921f4b292331a8074d31 100644 (file)
 // This file was generated by gir (https://github.com/gtk-rs/gir)
-// from gir-files (https://github.com/gtk-rs/gir-files)
+// from gir-files
 // DO NOT EDIT
 
-use glib;
+use crate::BootconfigParser;
+#[cfg(any(feature = "v2016_4", feature = "dox"))]
+#[cfg_attr(feature = "dox", doc(cfg(feature = "v2016_4")))]
+use crate::DeploymentUnlockedState;
 use glib::translate::*;
-use glib::GString;
-use glib_sys;
-use ostree_sys;
 use std::fmt;
-use BootconfigParser;
-#[cfg(any(feature = "v2016_4", feature = "dox"))]
-use DeploymentUnlockedState;
 
-glib_wrapper! {
-    pub struct Deployment(Object<ostree_sys::OstreeDeployment, DeploymentClass>);
+glib::wrapper! {
+    #[doc(alias = "OstreeDeployment")]
+    pub struct Deployment(Object<ffi::OstreeDeployment>);
 
     match fn {
-        get_type => || ostree_sys::ostree_deployment_get_type(),
+        type_ => || ffi::ostree_deployment_get_type(),
     }
 }
 
 impl Deployment {
+    #[doc(alias = "ostree_deployment_new")]
     pub fn new(index: i32, osname: &str, csum: &str, deployserial: i32, bootcsum: Option<&str>, bootserial: i32) -> Deployment {
         unsafe {
-            from_glib_full(ostree_sys::ostree_deployment_new(index, osname.to_glib_none().0, csum.to_glib_none().0, deployserial, bootcsum.to_glib_none().0, bootserial))
+            from_glib_full(ffi::ostree_deployment_new(index, osname.to_glib_none().0, csum.to_glib_none().0, deployserial, bootcsum.to_glib_none().0, bootserial))
         }
     }
 
+    #[doc(alias = "ostree_deployment_clone")]
     pub fn clone(&self) -> Option<Deployment> {
         unsafe {
-            from_glib_full(ostree_sys::ostree_deployment_clone(self.to_glib_none().0))
+            from_glib_full(ffi::ostree_deployment_clone(self.to_glib_none().0))
         }
     }
 
+    #[doc(alias = "ostree_deployment_equal")]
     pub fn equal(&self, bp: &Deployment) -> bool {
         unsafe {
-            from_glib(ostree_sys::ostree_deployment_equal(ToGlibPtr::<*mut ostree_sys::OstreeDeployment>::to_glib_none(self).0 as glib_sys::gconstpointer, ToGlibPtr::<*mut ostree_sys::OstreeDeployment>::to_glib_none(bp).0 as glib_sys::gconstpointer))
+            from_glib(ffi::ostree_deployment_equal(ToGlibPtr::<*mut ffi::OstreeDeployment>::to_glib_none(self).0 as glib::ffi::gconstpointer, ToGlibPtr::<*mut ffi::OstreeDeployment>::to_glib_none(bp).0 as glib::ffi::gconstpointer))
         }
     }
 
-    pub fn get_bootconfig(&self) -> Option<BootconfigParser> {
+    #[doc(alias = "ostree_deployment_get_bootconfig")]
+    #[doc(alias = "get_bootconfig")]
+    pub fn bootconfig(&self) -> Option<BootconfigParser> {
         unsafe {
-            from_glib_none(ostree_sys::ostree_deployment_get_bootconfig(self.to_glib_none().0))
+            from_glib_none(ffi::ostree_deployment_get_bootconfig(self.to_glib_none().0))
         }
     }
 
-    pub fn get_bootcsum(&self) -> Option<GString> {
+    #[doc(alias = "ostree_deployment_get_bootcsum")]
+    #[doc(alias = "get_bootcsum")]
+    pub fn bootcsum(&self) -> Option<glib::GString> {
         unsafe {
-            from_glib_none(ostree_sys::ostree_deployment_get_bootcsum(self.to_glib_none().0))
+            from_glib_none(ffi::ostree_deployment_get_bootcsum(self.to_glib_none().0))
         }
     }
 
-    pub fn get_bootserial(&self) -> i32 {
+    #[doc(alias = "ostree_deployment_get_bootserial")]
+    #[doc(alias = "get_bootserial")]
+    pub fn bootserial(&self) -> i32 {
         unsafe {
-            ostree_sys::ostree_deployment_get_bootserial(self.to_glib_none().0)
+            ffi::ostree_deployment_get_bootserial(self.to_glib_none().0)
         }
     }
 
-    pub fn get_csum(&self) -> Option<GString> {
+    #[doc(alias = "ostree_deployment_get_csum")]
+    #[doc(alias = "get_csum")]
+    pub fn csum(&self) -> Option<glib::GString> {
         unsafe {
-            from_glib_none(ostree_sys::ostree_deployment_get_csum(self.to_glib_none().0))
+            from_glib_none(ffi::ostree_deployment_get_csum(self.to_glib_none().0))
         }
     }
 
-    pub fn get_deployserial(&self) -> i32 {
+    #[doc(alias = "ostree_deployment_get_deployserial")]
+    #[doc(alias = "get_deployserial")]
+    pub fn deployserial(&self) -> i32 {
         unsafe {
-            ostree_sys::ostree_deployment_get_deployserial(self.to_glib_none().0)
+            ffi::ostree_deployment_get_deployserial(self.to_glib_none().0)
         }
     }
 
-    pub fn get_index(&self) -> i32 {
+    #[doc(alias = "ostree_deployment_get_index")]
+    #[doc(alias = "get_index")]
+    pub fn index(&self) -> i32 {
         unsafe {
-            ostree_sys::ostree_deployment_get_index(self.to_glib_none().0)
+            ffi::ostree_deployment_get_index(self.to_glib_none().0)
         }
     }
 
-    pub fn get_origin(&self) -> Option<glib::KeyFile> {
+    #[doc(alias = "ostree_deployment_get_origin")]
+    #[doc(alias = "get_origin")]
+    pub fn origin(&self) -> Option<glib::KeyFile> {
         unsafe {
-            from_glib_none(ostree_sys::ostree_deployment_get_origin(self.to_glib_none().0))
+            from_glib_none(ffi::ostree_deployment_get_origin(self.to_glib_none().0))
         }
     }
 
-    pub fn get_origin_relpath(&self) -> Option<GString> {
+    #[doc(alias = "ostree_deployment_get_origin_relpath")]
+    #[doc(alias = "get_origin_relpath")]
+    pub fn origin_relpath(&self) -> Option<glib::GString> {
         unsafe {
-            from_glib_full(ostree_sys::ostree_deployment_get_origin_relpath(self.to_glib_none().0))
+            from_glib_full(ffi::ostree_deployment_get_origin_relpath(self.to_glib_none().0))
         }
     }
 
-    pub fn get_osname(&self) -> Option<GString> {
+    #[doc(alias = "ostree_deployment_get_osname")]
+    #[doc(alias = "get_osname")]
+    pub fn osname(&self) -> Option<glib::GString> {
         unsafe {
-            from_glib_none(ostree_sys::ostree_deployment_get_osname(self.to_glib_none().0))
+            from_glib_none(ffi::ostree_deployment_get_osname(self.to_glib_none().0))
         }
     }
 
     #[cfg(any(feature = "v2016_4", feature = "dox"))]
-    pub fn get_unlocked(&self) -> DeploymentUnlockedState {
+    #[cfg_attr(feature = "dox", doc(cfg(feature = "v2016_4")))]
+    #[doc(alias = "ostree_deployment_get_unlocked")]
+    #[doc(alias = "get_unlocked")]
+    pub fn unlocked(&self) -> DeploymentUnlockedState {
         unsafe {
-            from_glib(ostree_sys::ostree_deployment_get_unlocked(self.to_glib_none().0))
+            from_glib(ffi::ostree_deployment_get_unlocked(self.to_glib_none().0))
         }
     }
 
+    #[doc(alias = "ostree_deployment_hash")]
     pub fn hash(&self) -> u32 {
         unsafe {
-            ostree_sys::ostree_deployment_hash(ToGlibPtr::<*mut ostree_sys::OstreeDeployment>::to_glib_none(self).0 as glib_sys::gconstpointer)
+            ffi::ostree_deployment_hash(ToGlibPtr::<*mut ffi::OstreeDeployment>::to_glib_none(self).0 as glib::ffi::gconstpointer)
         }
     }
 
     #[cfg(any(feature = "v2018_3", feature = "dox"))]
+    #[cfg_attr(feature = "dox", doc(cfg(feature = "v2018_3")))]
+    #[doc(alias = "ostree_deployment_is_pinned")]
     pub fn is_pinned(&self) -> bool {
         unsafe {
-            from_glib(ostree_sys::ostree_deployment_is_pinned(self.to_glib_none().0))
+            from_glib(ffi::ostree_deployment_is_pinned(self.to_glib_none().0))
         }
     }
 
     #[cfg(any(feature = "v2018_3", feature = "dox"))]
+    #[cfg_attr(feature = "dox", doc(cfg(feature = "v2018_3")))]
+    #[doc(alias = "ostree_deployment_is_staged")]
     pub fn is_staged(&self) -> bool {
         unsafe {
-            from_glib(ostree_sys::ostree_deployment_is_staged(self.to_glib_none().0))
+            from_glib(ffi::ostree_deployment_is_staged(self.to_glib_none().0))
         }
     }
 
+    #[doc(alias = "ostree_deployment_set_bootconfig")]
     pub fn set_bootconfig(&self, bootconfig: Option<&BootconfigParser>) {
         unsafe {
-            ostree_sys::ostree_deployment_set_bootconfig(self.to_glib_none().0, bootconfig.to_glib_none().0);
+            ffi::ostree_deployment_set_bootconfig(self.to_glib_none().0, bootconfig.to_glib_none().0);
         }
     }
 
+    #[doc(alias = "ostree_deployment_set_bootserial")]
     pub fn set_bootserial(&self, index: i32) {
         unsafe {
-            ostree_sys::ostree_deployment_set_bootserial(self.to_glib_none().0, index);
+            ffi::ostree_deployment_set_bootserial(self.to_glib_none().0, index);
         }
     }
 
+    #[doc(alias = "ostree_deployment_set_index")]
     pub fn set_index(&self, index: i32) {
         unsafe {
-            ostree_sys::ostree_deployment_set_index(self.to_glib_none().0, index);
+            ffi::ostree_deployment_set_index(self.to_glib_none().0, index);
         }
     }
 
+    #[doc(alias = "ostree_deployment_set_origin")]
     pub fn set_origin(&self, origin: Option<&glib::KeyFile>) {
         unsafe {
-            ostree_sys::ostree_deployment_set_origin(self.to_glib_none().0, origin.to_glib_none().0);
+            ffi::ostree_deployment_set_origin(self.to_glib_none().0, origin.to_glib_none().0);
         }
     }
 
     #[cfg(any(feature = "v2018_3", feature = "dox"))]
+    #[cfg_attr(feature = "dox", doc(cfg(feature = "v2018_3")))]
+    #[doc(alias = "ostree_deployment_origin_remove_transient_state")]
     pub fn origin_remove_transient_state(origin: &glib::KeyFile) {
         unsafe {
-            ostree_sys::ostree_deployment_origin_remove_transient_state(origin.to_glib_none().0);
+            ffi::ostree_deployment_origin_remove_transient_state(origin.to_glib_none().0);
         }
     }
 
     #[cfg(any(feature = "v2016_4", feature = "dox"))]
-    pub fn unlocked_state_to_string(state: DeploymentUnlockedState) -> Option<GString> {
+    #[cfg_attr(feature = "dox", doc(cfg(feature = "v2016_4")))]
+    #[doc(alias = "ostree_deployment_unlocked_state_to_string")]
+    pub fn unlocked_state_to_string(state: DeploymentUnlockedState) -> Option<glib::GString> {
         unsafe {
-            from_glib_none(ostree_sys::ostree_deployment_unlocked_state_to_string(state.to_glib()))
+            from_glib_none(ffi::ostree_deployment_unlocked_state_to_string(state.into_glib()))
         }
     }
 }
 
 impl fmt::Display for Deployment {
     fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        write!(f, "Deployment")
+        f.write_str("Deployment")
     }
 }
index 5e79189723fb5a5b39cc486ba9979d6481f9ff7a..7320367f8fd69884b3b3cfd65686a0c571820b70 100644 (file)
@@ -1,17 +1,15 @@
 // This file was generated by gir (https://github.com/gtk-rs/gir)
-// from gir-files (https://github.com/gtk-rs/gir-files)
+// from gir-files
 // DO NOT EDIT
 
-use glib::translate::*;
-use ostree_sys;
 
-glib_wrapper! {
+glib::wrapper! {
     #[derive(Debug, PartialEq, Eq, PartialOrd, Ord, Hash)]
-    pub struct DiffItem(Shared<ostree_sys::OstreeDiffItem>);
+    pub struct DiffItem(Shared<ffi::OstreeDiffItem>);
 
     match fn {
-        ref => |ptr| ostree_sys::ostree_diff_item_ref(ptr),
-        unref => |ptr| ostree_sys::ostree_diff_item_unref(ptr),
-        get_type => || ostree_sys::ostree_diff_item_get_type(),
+        ref => |ptr| ffi::ostree_diff_item_ref(ptr),
+        unref => |ptr| ffi::ostree_diff_item_unref(ptr),
+        type_ => || ffi::ostree_diff_item_get_type(),
     }
 }
index 91eb32366d2613048a098b3ccad6869332017a41..dd6ad465c0ca7b6bc34d90f50522e74db2f1c8fe 100644 (file)
 // This file was generated by gir (https://github.com/gtk-rs/gir)
-// from gir-files (https://github.com/gtk-rs/gir-files)
+// from gir-files
 // DO NOT EDIT
 
 use glib::translate::*;
-use ostree_sys;
 use std::fmt;
 
 #[derive(Debug, Eq, PartialEq, Ord, PartialOrd, Hash)]
 #[derive(Clone, Copy)]
 #[non_exhaustive]
+#[doc(alias = "OstreeDeploymentUnlockedState")]
 pub enum DeploymentUnlockedState {
+    #[doc(alias = "OSTREE_DEPLOYMENT_UNLOCKED_NONE")]
     None,
+    #[doc(alias = "OSTREE_DEPLOYMENT_UNLOCKED_DEVELOPMENT")]
     Development,
+    #[doc(alias = "OSTREE_DEPLOYMENT_UNLOCKED_HOTFIX")]
     Hotfix,
+    #[doc(alias = "OSTREE_DEPLOYMENT_UNLOCKED_TRANSIENT")]
     Transient,
-    #[doc(hidden)]
+#[doc(hidden)]
     __Unknown(i32),
 }
 
 impl fmt::Display for DeploymentUnlockedState {
     fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
         write!(f, "DeploymentUnlockedState::{}", match *self {
-            DeploymentUnlockedState::None => "None",
-            DeploymentUnlockedState::Development => "Development",
-            DeploymentUnlockedState::Hotfix => "Hotfix",
-            DeploymentUnlockedState::Transient => "Transient",
+            Self::None => "None",
+            Self::Development => "Development",
+            Self::Hotfix => "Hotfix",
+            Self::Transient => "Transient",
             _ => "Unknown",
         })
     }
 }
 
 #[doc(hidden)]
-impl ToGlib for DeploymentUnlockedState {
-    type GlibType = ostree_sys::OstreeDeploymentUnlockedState;
+impl IntoGlib for DeploymentUnlockedState {
+    type GlibType = ffi::OstreeDeploymentUnlockedState;
 
-    fn to_glib(&self) -> ostree_sys::OstreeDeploymentUnlockedState {
-        match *self {
-            DeploymentUnlockedState::None => ostree_sys::OSTREE_DEPLOYMENT_UNLOCKED_NONE,
-            DeploymentUnlockedState::Development => ostree_sys::OSTREE_DEPLOYMENT_UNLOCKED_DEVELOPMENT,
-            DeploymentUnlockedState::Hotfix => ostree_sys::OSTREE_DEPLOYMENT_UNLOCKED_HOTFIX,
-            DeploymentUnlockedState::Transient => ostree_sys::OSTREE_DEPLOYMENT_UNLOCKED_TRANSIENT,
-            DeploymentUnlockedState::__Unknown(value) => value
-        }
+    fn into_glib(self) -> ffi::OstreeDeploymentUnlockedState {
+        match self {
+            Self::None => ffi::OSTREE_DEPLOYMENT_UNLOCKED_NONE,
+            Self::Development => ffi::OSTREE_DEPLOYMENT_UNLOCKED_DEVELOPMENT,
+            Self::Hotfix => ffi::OSTREE_DEPLOYMENT_UNLOCKED_HOTFIX,
+            Self::Transient => ffi::OSTREE_DEPLOYMENT_UNLOCKED_TRANSIENT,
+            Self::__Unknown(value) => value,
+}
     }
 }
 
 #[doc(hidden)]
-impl FromGlib<ostree_sys::OstreeDeploymentUnlockedState> for DeploymentUnlockedState {
-    fn from_glib(value: ostree_sys::OstreeDeploymentUnlockedState) -> Self {
+impl FromGlib<ffi::OstreeDeploymentUnlockedState> for DeploymentUnlockedState {
+    unsafe fn from_glib(value: ffi::OstreeDeploymentUnlockedState) -> Self {
         match value {
-            0 => DeploymentUnlockedState::None,
-            1 => DeploymentUnlockedState::Development,
-            2 => DeploymentUnlockedState::Hotfix,
-            3 => DeploymentUnlockedState::Transient,
-            value => DeploymentUnlockedState::__Unknown(value),
-        }
+            ffi::OSTREE_DEPLOYMENT_UNLOCKED_NONE => Self::None,
+            ffi::OSTREE_DEPLOYMENT_UNLOCKED_DEVELOPMENT => Self::Development,
+            ffi::OSTREE_DEPLOYMENT_UNLOCKED_HOTFIX => Self::Hotfix,
+            ffi::OSTREE_DEPLOYMENT_UNLOCKED_TRANSIENT => Self::Transient,
+            value => Self::__Unknown(value),
+}
     }
 }
 
 #[derive(Debug, Eq, PartialEq, Ord, PartialOrd, Hash)]
 #[derive(Clone, Copy)]
 #[non_exhaustive]
+#[doc(alias = "OstreeGpgSignatureAttr")]
 pub enum GpgSignatureAttr {
+    #[doc(alias = "OSTREE_GPG_SIGNATURE_ATTR_VALID")]
     Valid,
+    #[doc(alias = "OSTREE_GPG_SIGNATURE_ATTR_SIG_EXPIRED")]
     SigExpired,
+    #[doc(alias = "OSTREE_GPG_SIGNATURE_ATTR_KEY_EXPIRED")]
     KeyExpired,
+    #[doc(alias = "OSTREE_GPG_SIGNATURE_ATTR_KEY_REVOKED")]
     KeyRevoked,
+    #[doc(alias = "OSTREE_GPG_SIGNATURE_ATTR_KEY_MISSING")]
     KeyMissing,
+    #[doc(alias = "OSTREE_GPG_SIGNATURE_ATTR_FINGERPRINT")]
     Fingerprint,
+    #[doc(alias = "OSTREE_GPG_SIGNATURE_ATTR_TIMESTAMP")]
     Timestamp,
+    #[doc(alias = "OSTREE_GPG_SIGNATURE_ATTR_EXP_TIMESTAMP")]
     ExpTimestamp,
+    #[doc(alias = "OSTREE_GPG_SIGNATURE_ATTR_PUBKEY_ALGO_NAME")]
     PubkeyAlgoName,
+    #[doc(alias = "OSTREE_GPG_SIGNATURE_ATTR_HASH_ALGO_NAME")]
     HashAlgoName,
+    #[doc(alias = "OSTREE_GPG_SIGNATURE_ATTR_USER_NAME")]
     UserName,
+    #[doc(alias = "OSTREE_GPG_SIGNATURE_ATTR_USER_EMAIL")]
     UserEmail,
+    #[doc(alias = "OSTREE_GPG_SIGNATURE_ATTR_FINGERPRINT_PRIMARY")]
     FingerprintPrimary,
+    #[doc(alias = "OSTREE_GPG_SIGNATURE_ATTR_KEY_EXP_TIMESTAMP")]
     KeyExpTimestamp,
+    #[doc(alias = "OSTREE_GPG_SIGNATURE_ATTR_KEY_EXP_TIMESTAMP_PRIMARY")]
     KeyExpTimestampPrimary,
-    #[doc(hidden)]
+#[doc(hidden)]
     __Unknown(i32),
 }
 
 impl fmt::Display for GpgSignatureAttr {
     fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
         write!(f, "GpgSignatureAttr::{}", match *self {
-            GpgSignatureAttr::Valid => "Valid",
-            GpgSignatureAttr::SigExpired => "SigExpired",
-            GpgSignatureAttr::KeyExpired => "KeyExpired",
-            GpgSignatureAttr::KeyRevoked => "KeyRevoked",
-            GpgSignatureAttr::KeyMissing => "KeyMissing",
-            GpgSignatureAttr::Fingerprint => "Fingerprint",
-            GpgSignatureAttr::Timestamp => "Timestamp",
-            GpgSignatureAttr::ExpTimestamp => "ExpTimestamp",
-            GpgSignatureAttr::PubkeyAlgoName => "PubkeyAlgoName",
-            GpgSignatureAttr::HashAlgoName => "HashAlgoName",
-            GpgSignatureAttr::UserName => "UserName",
-            GpgSignatureAttr::UserEmail => "UserEmail",
-            GpgSignatureAttr::FingerprintPrimary => "FingerprintPrimary",
-            GpgSignatureAttr::KeyExpTimestamp => "KeyExpTimestamp",
-            GpgSignatureAttr::KeyExpTimestampPrimary => "KeyExpTimestampPrimary",
+            Self::Valid => "Valid",
+            Self::SigExpired => "SigExpired",
+            Self::KeyExpired => "KeyExpired",
+            Self::KeyRevoked => "KeyRevoked",
+            Self::KeyMissing => "KeyMissing",
+            Self::Fingerprint => "Fingerprint",
+            Self::Timestamp => "Timestamp",
+            Self::ExpTimestamp => "ExpTimestamp",
+            Self::PubkeyAlgoName => "PubkeyAlgoName",
+            Self::HashAlgoName => "HashAlgoName",
+            Self::UserName => "UserName",
+            Self::UserEmail => "UserEmail",
+            Self::FingerprintPrimary => "FingerprintPrimary",
+            Self::KeyExpTimestamp => "KeyExpTimestamp",
+            Self::KeyExpTimestampPrimary => "KeyExpTimestampPrimary",
             _ => "Unknown",
         })
     }
 }
 
 #[doc(hidden)]
-impl ToGlib for GpgSignatureAttr {
-    type GlibType = ostree_sys::OstreeGpgSignatureAttr;
-
-    fn to_glib(&self) -> ostree_sys::OstreeGpgSignatureAttr {
-        match *self {
-            GpgSignatureAttr::Valid => ostree_sys::OSTREE_GPG_SIGNATURE_ATTR_VALID,
-            GpgSignatureAttr::SigExpired => ostree_sys::OSTREE_GPG_SIGNATURE_ATTR_SIG_EXPIRED,
-            GpgSignatureAttr::KeyExpired => ostree_sys::OSTREE_GPG_SIGNATURE_ATTR_KEY_EXPIRED,
-            GpgSignatureAttr::KeyRevoked => ostree_sys::OSTREE_GPG_SIGNATURE_ATTR_KEY_REVOKED,
-            GpgSignatureAttr::KeyMissing => ostree_sys::OSTREE_GPG_SIGNATURE_ATTR_KEY_MISSING,
-            GpgSignatureAttr::Fingerprint => ostree_sys::OSTREE_GPG_SIGNATURE_ATTR_FINGERPRINT,
-            GpgSignatureAttr::Timestamp => ostree_sys::OSTREE_GPG_SIGNATURE_ATTR_TIMESTAMP,
-            GpgSignatureAttr::ExpTimestamp => ostree_sys::OSTREE_GPG_SIGNATURE_ATTR_EXP_TIMESTAMP,
-            GpgSignatureAttr::PubkeyAlgoName => ostree_sys::OSTREE_GPG_SIGNATURE_ATTR_PUBKEY_ALGO_NAME,
-            GpgSignatureAttr::HashAlgoName => ostree_sys::OSTREE_GPG_SIGNATURE_ATTR_HASH_ALGO_NAME,
-            GpgSignatureAttr::UserName => ostree_sys::OSTREE_GPG_SIGNATURE_ATTR_USER_NAME,
-            GpgSignatureAttr::UserEmail => ostree_sys::OSTREE_GPG_SIGNATURE_ATTR_USER_EMAIL,
-            GpgSignatureAttr::FingerprintPrimary => ostree_sys::OSTREE_GPG_SIGNATURE_ATTR_FINGERPRINT_PRIMARY,
-            GpgSignatureAttr::KeyExpTimestamp => ostree_sys::OSTREE_GPG_SIGNATURE_ATTR_KEY_EXP_TIMESTAMP,
-            GpgSignatureAttr::KeyExpTimestampPrimary => ostree_sys::OSTREE_GPG_SIGNATURE_ATTR_KEY_EXP_TIMESTAMP_PRIMARY,
-            GpgSignatureAttr::__Unknown(value) => value
-        }
+impl IntoGlib for GpgSignatureAttr {
+    type GlibType = ffi::OstreeGpgSignatureAttr;
+
+    fn into_glib(self) -> ffi::OstreeGpgSignatureAttr {
+        match self {
+            Self::Valid => ffi::OSTREE_GPG_SIGNATURE_ATTR_VALID,
+            Self::SigExpired => ffi::OSTREE_GPG_SIGNATURE_ATTR_SIG_EXPIRED,
+            Self::KeyExpired => ffi::OSTREE_GPG_SIGNATURE_ATTR_KEY_EXPIRED,
+            Self::KeyRevoked => ffi::OSTREE_GPG_SIGNATURE_ATTR_KEY_REVOKED,
+            Self::KeyMissing => ffi::OSTREE_GPG_SIGNATURE_ATTR_KEY_MISSING,
+            Self::Fingerprint => ffi::OSTREE_GPG_SIGNATURE_ATTR_FINGERPRINT,
+            Self::Timestamp => ffi::OSTREE_GPG_SIGNATURE_ATTR_TIMESTAMP,
+            Self::ExpTimestamp => ffi::OSTREE_GPG_SIGNATURE_ATTR_EXP_TIMESTAMP,
+            Self::PubkeyAlgoName => ffi::OSTREE_GPG_SIGNATURE_ATTR_PUBKEY_ALGO_NAME,
+            Self::HashAlgoName => ffi::OSTREE_GPG_SIGNATURE_ATTR_HASH_ALGO_NAME,
+            Self::UserName => ffi::OSTREE_GPG_SIGNATURE_ATTR_USER_NAME,
+            Self::UserEmail => ffi::OSTREE_GPG_SIGNATURE_ATTR_USER_EMAIL,
+            Self::FingerprintPrimary => ffi::OSTREE_GPG_SIGNATURE_ATTR_FINGERPRINT_PRIMARY,
+            Self::KeyExpTimestamp => ffi::OSTREE_GPG_SIGNATURE_ATTR_KEY_EXP_TIMESTAMP,
+            Self::KeyExpTimestampPrimary => ffi::OSTREE_GPG_SIGNATURE_ATTR_KEY_EXP_TIMESTAMP_PRIMARY,
+            Self::__Unknown(value) => value,
+}
     }
 }
 
 #[doc(hidden)]
-impl FromGlib<ostree_sys::OstreeGpgSignatureAttr> for GpgSignatureAttr {
-    fn from_glib(value: ostree_sys::OstreeGpgSignatureAttr) -> Self {
+impl FromGlib<ffi::OstreeGpgSignatureAttr> for GpgSignatureAttr {
+    unsafe fn from_glib(value: ffi::OstreeGpgSignatureAttr) -> Self {
         match value {
-            0 => GpgSignatureAttr::Valid,
-            1 => GpgSignatureAttr::SigExpired,
-            2 => GpgSignatureAttr::KeyExpired,
-            3 => GpgSignatureAttr::KeyRevoked,
-            4 => GpgSignatureAttr::KeyMissing,
-            5 => GpgSignatureAttr::Fingerprint,
-            6 => GpgSignatureAttr::Timestamp,
-            7 => GpgSignatureAttr::ExpTimestamp,
-            8 => GpgSignatureAttr::PubkeyAlgoName,
-            9 => GpgSignatureAttr::HashAlgoName,
-            10 => GpgSignatureAttr::UserName,
-            11 => GpgSignatureAttr::UserEmail,
-            12 => GpgSignatureAttr::FingerprintPrimary,
-            13 => GpgSignatureAttr::KeyExpTimestamp,
-            14 => GpgSignatureAttr::KeyExpTimestampPrimary,
-            value => GpgSignatureAttr::__Unknown(value),
-        }
+            ffi::OSTREE_GPG_SIGNATURE_ATTR_VALID => Self::Valid,
+            ffi::OSTREE_GPG_SIGNATURE_ATTR_SIG_EXPIRED => Self::SigExpired,
+            ffi::OSTREE_GPG_SIGNATURE_ATTR_KEY_EXPIRED => Self::KeyExpired,
+            ffi::OSTREE_GPG_SIGNATURE_ATTR_KEY_REVOKED => Self::KeyRevoked,
+            ffi::OSTREE_GPG_SIGNATURE_ATTR_KEY_MISSING => Self::KeyMissing,
+            ffi::OSTREE_GPG_SIGNATURE_ATTR_FINGERPRINT => Self::Fingerprint,
+            ffi::OSTREE_GPG_SIGNATURE_ATTR_TIMESTAMP => Self::Timestamp,
+            ffi::OSTREE_GPG_SIGNATURE_ATTR_EXP_TIMESTAMP => Self::ExpTimestamp,
+            ffi::OSTREE_GPG_SIGNATURE_ATTR_PUBKEY_ALGO_NAME => Self::PubkeyAlgoName,
+            ffi::OSTREE_GPG_SIGNATURE_ATTR_HASH_ALGO_NAME => Self::HashAlgoName,
+            ffi::OSTREE_GPG_SIGNATURE_ATTR_USER_NAME => Self::UserName,
+            ffi::OSTREE_GPG_SIGNATURE_ATTR_USER_EMAIL => Self::UserEmail,
+            ffi::OSTREE_GPG_SIGNATURE_ATTR_FINGERPRINT_PRIMARY => Self::FingerprintPrimary,
+            ffi::OSTREE_GPG_SIGNATURE_ATTR_KEY_EXP_TIMESTAMP => Self::KeyExpTimestamp,
+            ffi::OSTREE_GPG_SIGNATURE_ATTR_KEY_EXP_TIMESTAMP_PRIMARY => Self::KeyExpTimestampPrimary,
+            value => Self::__Unknown(value),
+}
     }
 }
 
 #[derive(Debug, Eq, PartialEq, Ord, PartialOrd, Hash)]
 #[derive(Clone, Copy)]
 #[non_exhaustive]
+#[doc(alias = "OstreeObjectType")]
 pub enum ObjectType {
+    #[doc(alias = "OSTREE_OBJECT_TYPE_FILE")]
     File,
+    #[doc(alias = "OSTREE_OBJECT_TYPE_DIR_TREE")]
     DirTree,
+    #[doc(alias = "OSTREE_OBJECT_TYPE_DIR_META")]
     DirMeta,
+    #[doc(alias = "OSTREE_OBJECT_TYPE_COMMIT")]
     Commit,
+    #[doc(alias = "OSTREE_OBJECT_TYPE_TOMBSTONE_COMMIT")]
     TombstoneCommit,
+    #[doc(alias = "OSTREE_OBJECT_TYPE_COMMIT_META")]
     CommitMeta,
+    #[doc(alias = "OSTREE_OBJECT_TYPE_PAYLOAD_LINK")]
     PayloadLink,
-    #[doc(hidden)]
+#[doc(hidden)]
     __Unknown(i32),
 }
 
 impl fmt::Display for ObjectType {
     fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
         write!(f, "ObjectType::{}", match *self {
-            ObjectType::File => "File",
-            ObjectType::DirTree => "DirTree",
-            ObjectType::DirMeta => "DirMeta",
-            ObjectType::Commit => "Commit",
-            ObjectType::TombstoneCommit => "TombstoneCommit",
-            ObjectType::CommitMeta => "CommitMeta",
-            ObjectType::PayloadLink => "PayloadLink",
+            Self::File => "File",
+            Self::DirTree => "DirTree",
+            Self::DirMeta => "DirMeta",
+            Self::Commit => "Commit",
+            Self::TombstoneCommit => "TombstoneCommit",
+            Self::CommitMeta => "CommitMeta",
+            Self::PayloadLink => "PayloadLink",
             _ => "Unknown",
         })
     }
 }
 
 #[doc(hidden)]
-impl ToGlib for ObjectType {
-    type GlibType = ostree_sys::OstreeObjectType;
+impl IntoGlib for ObjectType {
+    type GlibType = ffi::OstreeObjectType;
 
-    fn to_glib(&self) -> ostree_sys::OstreeObjectType {
-        match *self {
-            ObjectType::File => ostree_sys::OSTREE_OBJECT_TYPE_FILE,
-            ObjectType::DirTree => ostree_sys::OSTREE_OBJECT_TYPE_DIR_TREE,
-            ObjectType::DirMeta => ostree_sys::OSTREE_OBJECT_TYPE_DIR_META,
-            ObjectType::Commit => ostree_sys::OSTREE_OBJECT_TYPE_COMMIT,
-            ObjectType::TombstoneCommit => ostree_sys::OSTREE_OBJECT_TYPE_TOMBSTONE_COMMIT,
-            ObjectType::CommitMeta => ostree_sys::OSTREE_OBJECT_TYPE_COMMIT_META,
-            ObjectType::PayloadLink => ostree_sys::OSTREE_OBJECT_TYPE_PAYLOAD_LINK,
-            ObjectType::__Unknown(value) => value
-        }
+    fn into_glib(self) -> ffi::OstreeObjectType {
+        match self {
+            Self::File => ffi::OSTREE_OBJECT_TYPE_FILE,
+            Self::DirTree => ffi::OSTREE_OBJECT_TYPE_DIR_TREE,
+            Self::DirMeta => ffi::OSTREE_OBJECT_TYPE_DIR_META,
+            Self::Commit => ffi::OSTREE_OBJECT_TYPE_COMMIT,
+            Self::TombstoneCommit => ffi::OSTREE_OBJECT_TYPE_TOMBSTONE_COMMIT,
+            Self::CommitMeta => ffi::OSTREE_OBJECT_TYPE_COMMIT_META,
+            Self::PayloadLink => ffi::OSTREE_OBJECT_TYPE_PAYLOAD_LINK,
+            Self::__Unknown(value) => value,
+}
     }
 }
 
 #[doc(hidden)]
-impl FromGlib<ostree_sys::OstreeObjectType> for ObjectType {
-    fn from_glib(value: ostree_sys::OstreeObjectType) -> Self {
+impl FromGlib<ffi::OstreeObjectType> for ObjectType {
+    unsafe fn from_glib(value: ffi::OstreeObjectType) -> Self {
         match value {
-            1 => ObjectType::File,
-            2 => ObjectType::DirTree,
-            3 => ObjectType::DirMeta,
-            4 => ObjectType::Commit,
-            5 => ObjectType::TombstoneCommit,
-            6 => ObjectType::CommitMeta,
-            7 => ObjectType::PayloadLink,
-            value => ObjectType::__Unknown(value),
-        }
+            ffi::OSTREE_OBJECT_TYPE_FILE => Self::File,
+            ffi::OSTREE_OBJECT_TYPE_DIR_TREE => Self::DirTree,
+            ffi::OSTREE_OBJECT_TYPE_DIR_META => Self::DirMeta,
+            ffi::OSTREE_OBJECT_TYPE_COMMIT => Self::Commit,
+            ffi::OSTREE_OBJECT_TYPE_TOMBSTONE_COMMIT => Self::TombstoneCommit,
+            ffi::OSTREE_OBJECT_TYPE_COMMIT_META => Self::CommitMeta,
+            ffi::OSTREE_OBJECT_TYPE_PAYLOAD_LINK => Self::PayloadLink,
+            value => Self::__Unknown(value),
+}
     }
 }
 
 #[cfg(any(feature = "v2018_2", feature = "dox"))]
+#[cfg_attr(feature = "dox", doc(cfg(feature = "v2018_2")))]
 #[derive(Debug, Eq, PartialEq, Ord, PartialOrd, Hash)]
 #[derive(Clone, Copy)]
 #[non_exhaustive]
+#[doc(alias = "OstreeRepoCheckoutFilterResult")]
 pub enum RepoCheckoutFilterResult {
+    #[doc(alias = "OSTREE_REPO_CHECKOUT_FILTER_ALLOW")]
     Allow,
+    #[doc(alias = "OSTREE_REPO_CHECKOUT_FILTER_SKIP")]
     Skip,
-    #[doc(hidden)]
+#[doc(hidden)]
     __Unknown(i32),
 }
 
 #[cfg(any(feature = "v2018_2", feature = "dox"))]
+#[cfg_attr(feature = "dox", doc(cfg(feature = "v2018_2")))]
 impl fmt::Display for RepoCheckoutFilterResult {
     fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
         write!(f, "RepoCheckoutFilterResult::{}", match *self {
-            RepoCheckoutFilterResult::Allow => "Allow",
-            RepoCheckoutFilterResult::Skip => "Skip",
+            Self::Allow => "Allow",
+            Self::Skip => "Skip",
             _ => "Unknown",
         })
     }
 }
 
 #[cfg(any(feature = "v2018_2", feature = "dox"))]
+#[cfg_attr(feature = "dox", doc(cfg(feature = "v2018_2")))]
 #[doc(hidden)]
-impl ToGlib for RepoCheckoutFilterResult {
-    type GlibType = ostree_sys::OstreeRepoCheckoutFilterResult;
+impl IntoGlib for RepoCheckoutFilterResult {
+    type GlibType = ffi::OstreeRepoCheckoutFilterResult;
 
-    fn to_glib(&self) -> ostree_sys::OstreeRepoCheckoutFilterResult {
-        match *self {
-            RepoCheckoutFilterResult::Allow => ostree_sys::OSTREE_REPO_CHECKOUT_FILTER_ALLOW,
-            RepoCheckoutFilterResult::Skip => ostree_sys::OSTREE_REPO_CHECKOUT_FILTER_SKIP,
-            RepoCheckoutFilterResult::__Unknown(value) => value
-        }
+    fn into_glib(self) -> ffi::OstreeRepoCheckoutFilterResult {
+        match self {
+            Self::Allow => ffi::OSTREE_REPO_CHECKOUT_FILTER_ALLOW,
+            Self::Skip => ffi::OSTREE_REPO_CHECKOUT_FILTER_SKIP,
+            Self::__Unknown(value) => value,
+}
     }
 }
 
 #[cfg(any(feature = "v2018_2", feature = "dox"))]
+#[cfg_attr(feature = "dox", doc(cfg(feature = "v2018_2")))]
 #[doc(hidden)]
-impl FromGlib<ostree_sys::OstreeRepoCheckoutFilterResult> for RepoCheckoutFilterResult {
-    fn from_glib(value: ostree_sys::OstreeRepoCheckoutFilterResult) -> Self {
+impl FromGlib<ffi::OstreeRepoCheckoutFilterResult> for RepoCheckoutFilterResult {
+    unsafe fn from_glib(value: ffi::OstreeRepoCheckoutFilterResult) -> Self {
         match value {
-            0 => RepoCheckoutFilterResult::Allow,
-            1 => RepoCheckoutFilterResult::Skip,
-            value => RepoCheckoutFilterResult::__Unknown(value),
-        }
+            ffi::OSTREE_REPO_CHECKOUT_FILTER_ALLOW => Self::Allow,
+            ffi::OSTREE_REPO_CHECKOUT_FILTER_SKIP => Self::Skip,
+            value => Self::__Unknown(value),
+}
     }
 }
 
 #[derive(Debug, Eq, PartialEq, Ord, PartialOrd, Hash)]
 #[derive(Clone, Copy)]
 #[non_exhaustive]
+#[doc(alias = "OstreeRepoCheckoutMode")]
 pub enum RepoCheckoutMode {
+    #[doc(alias = "OSTREE_REPO_CHECKOUT_MODE_NONE")]
     None,
+    #[doc(alias = "OSTREE_REPO_CHECKOUT_MODE_USER")]
     User,
-    #[doc(hidden)]
+#[doc(hidden)]
     __Unknown(i32),
 }
 
 impl fmt::Display for RepoCheckoutMode {
     fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
         write!(f, "RepoCheckoutMode::{}", match *self {
-            RepoCheckoutMode::None => "None",
-            RepoCheckoutMode::User => "User",
+            Self::None => "None",
+            Self::User => "User",
             _ => "Unknown",
         })
     }
 }
 
 #[doc(hidden)]
-impl ToGlib for RepoCheckoutMode {
-    type GlibType = ostree_sys::OstreeRepoCheckoutMode;
+impl IntoGlib for RepoCheckoutMode {
+    type GlibType = ffi::OstreeRepoCheckoutMode;
 
-    fn to_glib(&self) -> ostree_sys::OstreeRepoCheckoutMode {
-        match *self {
-            RepoCheckoutMode::None => ostree_sys::OSTREE_REPO_CHECKOUT_MODE_NONE,
-            RepoCheckoutMode::User => ostree_sys::OSTREE_REPO_CHECKOUT_MODE_USER,
-            RepoCheckoutMode::__Unknown(value) => value
-        }
+    fn into_glib(self) -> ffi::OstreeRepoCheckoutMode {
+        match self {
+            Self::None => ffi::OSTREE_REPO_CHECKOUT_MODE_NONE,
+            Self::User => ffi::OSTREE_REPO_CHECKOUT_MODE_USER,
+            Self::__Unknown(value) => value,
+}
     }
 }
 
 #[doc(hidden)]
-impl FromGlib<ostree_sys::OstreeRepoCheckoutMode> for RepoCheckoutMode {
-    fn from_glib(value: ostree_sys::OstreeRepoCheckoutMode) -> Self {
+impl FromGlib<ffi::OstreeRepoCheckoutMode> for RepoCheckoutMode {
+    unsafe fn from_glib(value: ffi::OstreeRepoCheckoutMode) -> Self {
         match value {
-            0 => RepoCheckoutMode::None,
-            1 => RepoCheckoutMode::User,
-            value => RepoCheckoutMode::__Unknown(value),
-        }
+            ffi::OSTREE_REPO_CHECKOUT_MODE_NONE => Self::None,
+            ffi::OSTREE_REPO_CHECKOUT_MODE_USER => Self::User,
+            value => Self::__Unknown(value),
+}
     }
 }
 
 #[derive(Debug, Eq, PartialEq, Ord, PartialOrd, Hash)]
 #[derive(Clone, Copy)]
 #[non_exhaustive]
+#[doc(alias = "OstreeRepoCheckoutOverwriteMode")]
 pub enum RepoCheckoutOverwriteMode {
+    #[doc(alias = "OSTREE_REPO_CHECKOUT_OVERWRITE_NONE")]
     None,
+    #[doc(alias = "OSTREE_REPO_CHECKOUT_OVERWRITE_UNION_FILES")]
     UnionFiles,
+    #[doc(alias = "OSTREE_REPO_CHECKOUT_OVERWRITE_ADD_FILES")]
     AddFiles,
+    #[doc(alias = "OSTREE_REPO_CHECKOUT_OVERWRITE_UNION_IDENTICAL")]
     UnionIdentical,
-    #[doc(hidden)]
+#[doc(hidden)]
     __Unknown(i32),
 }
 
 impl fmt::Display for RepoCheckoutOverwriteMode {
     fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
         write!(f, "RepoCheckoutOverwriteMode::{}", match *self {
-            RepoCheckoutOverwriteMode::None => "None",
-            RepoCheckoutOverwriteMode::UnionFiles => "UnionFiles",
-            RepoCheckoutOverwriteMode::AddFiles => "AddFiles",
-            RepoCheckoutOverwriteMode::UnionIdentical => "UnionIdentical",
+            Self::None => "None",
+            Self::UnionFiles => "UnionFiles",
+            Self::AddFiles => "AddFiles",
+            Self::UnionIdentical => "UnionIdentical",
             _ => "Unknown",
         })
     }
 }
 
 #[doc(hidden)]
-impl ToGlib for RepoCheckoutOverwriteMode {
-    type GlibType = ostree_sys::OstreeRepoCheckoutOverwriteMode;
+impl IntoGlib for RepoCheckoutOverwriteMode {
+    type GlibType = ffi::OstreeRepoCheckoutOverwriteMode;
 
-    fn to_glib(&self) -> ostree_sys::OstreeRepoCheckoutOverwriteMode {
-        match *self {
-            RepoCheckoutOverwriteMode::None => ostree_sys::OSTREE_REPO_CHECKOUT_OVERWRITE_NONE,
-            RepoCheckoutOverwriteMode::UnionFiles => ostree_sys::OSTREE_REPO_CHECKOUT_OVERWRITE_UNION_FILES,
-            RepoCheckoutOverwriteMode::AddFiles => ostree_sys::OSTREE_REPO_CHECKOUT_OVERWRITE_ADD_FILES,
-            RepoCheckoutOverwriteMode::UnionIdentical => ostree_sys::OSTREE_REPO_CHECKOUT_OVERWRITE_UNION_IDENTICAL,
-            RepoCheckoutOverwriteMode::__Unknown(value) => value
-        }
+    fn into_glib(self) -> ffi::OstreeRepoCheckoutOverwriteMode {
+        match self {
+            Self::None => ffi::OSTREE_REPO_CHECKOUT_OVERWRITE_NONE,
+            Self::UnionFiles => ffi::OSTREE_REPO_CHECKOUT_OVERWRITE_UNION_FILES,
+            Self::AddFiles => ffi::OSTREE_REPO_CHECKOUT_OVERWRITE_ADD_FILES,
+            Self::UnionIdentical => ffi::OSTREE_REPO_CHECKOUT_OVERWRITE_UNION_IDENTICAL,
+            Self::__Unknown(value) => value,
+}
     }
 }
 
 #[doc(hidden)]
-impl FromGlib<ostree_sys::OstreeRepoCheckoutOverwriteMode> for RepoCheckoutOverwriteMode {
-    fn from_glib(value: ostree_sys::OstreeRepoCheckoutOverwriteMode) -> Self {
+impl FromGlib<ffi::OstreeRepoCheckoutOverwriteMode> for RepoCheckoutOverwriteMode {
+    unsafe fn from_glib(value: ffi::OstreeRepoCheckoutOverwriteMode) -> Self {
         match value {
-            0 => RepoCheckoutOverwriteMode::None,
-            1 => RepoCheckoutOverwriteMode::UnionFiles,
-            2 => RepoCheckoutOverwriteMode::AddFiles,
-            3 => RepoCheckoutOverwriteMode::UnionIdentical,
-            value => RepoCheckoutOverwriteMode::__Unknown(value),
-        }
+            ffi::OSTREE_REPO_CHECKOUT_OVERWRITE_NONE => Self::None,
+            ffi::OSTREE_REPO_CHECKOUT_OVERWRITE_UNION_FILES => Self::UnionFiles,
+            ffi::OSTREE_REPO_CHECKOUT_OVERWRITE_ADD_FILES => Self::AddFiles,
+            ffi::OSTREE_REPO_CHECKOUT_OVERWRITE_UNION_IDENTICAL => Self::UnionIdentical,
+            value => Self::__Unknown(value),
+}
     }
 }
 
 #[derive(Debug, Eq, PartialEq, Ord, PartialOrd, Hash)]
 #[derive(Clone, Copy)]
 #[non_exhaustive]
+#[doc(alias = "OstreeRepoCommitFilterResult")]
 pub enum RepoCommitFilterResult {
+    #[doc(alias = "OSTREE_REPO_COMMIT_FILTER_ALLOW")]
     Allow,
+    #[doc(alias = "OSTREE_REPO_COMMIT_FILTER_SKIP")]
     Skip,
-    #[doc(hidden)]
+#[doc(hidden)]
     __Unknown(i32),
 }
 
 impl fmt::Display for RepoCommitFilterResult {
     fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
         write!(f, "RepoCommitFilterResult::{}", match *self {
-            RepoCommitFilterResult::Allow => "Allow",
-            RepoCommitFilterResult::Skip => "Skip",
+            Self::Allow => "Allow",
+            Self::Skip => "Skip",
             _ => "Unknown",
         })
     }
 }
 
 #[doc(hidden)]
-impl ToGlib for RepoCommitFilterResult {
-    type GlibType = ostree_sys::OstreeRepoCommitFilterResult;
+impl IntoGlib for RepoCommitFilterResult {
+    type GlibType = ffi::OstreeRepoCommitFilterResult;
 
-    fn to_glib(&self) -> ostree_sys::OstreeRepoCommitFilterResult {
-        match *self {
-            RepoCommitFilterResult::Allow => ostree_sys::OSTREE_REPO_COMMIT_FILTER_ALLOW,
-            RepoCommitFilterResult::Skip => ostree_sys::OSTREE_REPO_COMMIT_FILTER_SKIP,
-            RepoCommitFilterResult::__Unknown(value) => value
-        }
+    fn into_glib(self) -> ffi::OstreeRepoCommitFilterResult {
+        match self {
+            Self::Allow => ffi::OSTREE_REPO_COMMIT_FILTER_ALLOW,
+            Self::Skip => ffi::OSTREE_REPO_COMMIT_FILTER_SKIP,
+            Self::__Unknown(value) => value,
+}
     }
 }
 
 #[doc(hidden)]
-impl FromGlib<ostree_sys::OstreeRepoCommitFilterResult> for RepoCommitFilterResult {
-    fn from_glib(value: ostree_sys::OstreeRepoCommitFilterResult) -> Self {
+impl FromGlib<ffi::OstreeRepoCommitFilterResult> for RepoCommitFilterResult {
+    unsafe fn from_glib(value: ffi::OstreeRepoCommitFilterResult) -> Self {
         match value {
-            0 => RepoCommitFilterResult::Allow,
-            1 => RepoCommitFilterResult::Skip,
-            value => RepoCommitFilterResult::__Unknown(value),
-        }
+            ffi::OSTREE_REPO_COMMIT_FILTER_ALLOW => Self::Allow,
+            ffi::OSTREE_REPO_COMMIT_FILTER_SKIP => Self::Skip,
+            value => Self::__Unknown(value),
+}
     }
 }
 
 #[derive(Debug, Eq, PartialEq, Ord, PartialOrd, Hash)]
 #[derive(Clone, Copy)]
 #[non_exhaustive]
+#[doc(alias = "OstreeRepoCommitIterResult")]
 pub enum RepoCommitIterResult {
+    #[doc(alias = "OSTREE_REPO_COMMIT_ITER_RESULT_ERROR")]
     Error,
+    #[doc(alias = "OSTREE_REPO_COMMIT_ITER_RESULT_END")]
     End,
+    #[doc(alias = "OSTREE_REPO_COMMIT_ITER_RESULT_FILE")]
     File,
+    #[doc(alias = "OSTREE_REPO_COMMIT_ITER_RESULT_DIR")]
     Dir,
-    #[doc(hidden)]
+#[doc(hidden)]
     __Unknown(i32),
 }
 
 impl fmt::Display for RepoCommitIterResult {
     fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
         write!(f, "RepoCommitIterResult::{}", match *self {
-            RepoCommitIterResult::Error => "Error",
-            RepoCommitIterResult::End => "End",
-            RepoCommitIterResult::File => "File",
-            RepoCommitIterResult::Dir => "Dir",
+            Self::Error => "Error",
+            Self::End => "End",
+            Self::File => "File",
+            Self::Dir => "Dir",
             _ => "Unknown",
         })
     }
 }
 
 #[doc(hidden)]
-impl ToGlib for RepoCommitIterResult {
-    type GlibType = ostree_sys::OstreeRepoCommitIterResult;
+impl IntoGlib for RepoCommitIterResult {
+    type GlibType = ffi::OstreeRepoCommitIterResult;
 
-    fn to_glib(&self) -> ostree_sys::OstreeRepoCommitIterResult {
-        match *self {
-            RepoCommitIterResult::Error => ostree_sys::OSTREE_REPO_COMMIT_ITER_RESULT_ERROR,
-            RepoCommitIterResult::End => ostree_sys::OSTREE_REPO_COMMIT_ITER_RESULT_END,
-            RepoCommitIterResult::File => ostree_sys::OSTREE_REPO_COMMIT_ITER_RESULT_FILE,
-            RepoCommitIterResult::Dir => ostree_sys::OSTREE_REPO_COMMIT_ITER_RESULT_DIR,
-            RepoCommitIterResult::__Unknown(value) => value
-        }
+    fn into_glib(self) -> ffi::OstreeRepoCommitIterResult {
+        match self {
+            Self::Error => ffi::OSTREE_REPO_COMMIT_ITER_RESULT_ERROR,
+            Self::End => ffi::OSTREE_REPO_COMMIT_ITER_RESULT_END,
+            Self::File => ffi::OSTREE_REPO_COMMIT_ITER_RESULT_FILE,
+            Self::Dir => ffi::OSTREE_REPO_COMMIT_ITER_RESULT_DIR,
+            Self::__Unknown(value) => value,
+}
     }
 }
 
 #[doc(hidden)]
-impl FromGlib<ostree_sys::OstreeRepoCommitIterResult> for RepoCommitIterResult {
-    fn from_glib(value: ostree_sys::OstreeRepoCommitIterResult) -> Self {
+impl FromGlib<ffi::OstreeRepoCommitIterResult> for RepoCommitIterResult {
+    unsafe fn from_glib(value: ffi::OstreeRepoCommitIterResult) -> Self {
         match value {
-            0 => RepoCommitIterResult::Error,
-            1 => RepoCommitIterResult::End,
-            2 => RepoCommitIterResult::File,
-            3 => RepoCommitIterResult::Dir,
-            value => RepoCommitIterResult::__Unknown(value),
-        }
+            ffi::OSTREE_REPO_COMMIT_ITER_RESULT_ERROR => Self::Error,
+            ffi::OSTREE_REPO_COMMIT_ITER_RESULT_END => Self::End,
+            ffi::OSTREE_REPO_COMMIT_ITER_RESULT_FILE => Self::File,
+            ffi::OSTREE_REPO_COMMIT_ITER_RESULT_DIR => Self::Dir,
+            value => Self::__Unknown(value),
+}
     }
 }
 
 #[derive(Debug, Eq, PartialEq, Ord, PartialOrd, Hash)]
 #[derive(Clone, Copy)]
 #[non_exhaustive]
+#[doc(alias = "OstreeRepoMode")]
 pub enum RepoMode {
+    #[doc(alias = "OSTREE_REPO_MODE_BARE")]
     Bare,
+    #[doc(alias = "OSTREE_REPO_MODE_ARCHIVE")]
     Archive,
+    #[doc(alias = "OSTREE_REPO_MODE_BARE_USER")]
     BareUser,
+    #[doc(alias = "OSTREE_REPO_MODE_BARE_USER_ONLY")]
     BareUserOnly,
-    #[doc(hidden)]
+#[doc(hidden)]
     __Unknown(i32),
 }
 
 impl fmt::Display for RepoMode {
     fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
         write!(f, "RepoMode::{}", match *self {
-            RepoMode::Bare => "Bare",
-            RepoMode::Archive => "Archive",
-            RepoMode::BareUser => "BareUser",
-            RepoMode::BareUserOnly => "BareUserOnly",
+            Self::Bare => "Bare",
+            Self::Archive => "Archive",
+            Self::BareUser => "BareUser",
+            Self::BareUserOnly => "BareUserOnly",
             _ => "Unknown",
         })
     }
 }
 
 #[doc(hidden)]
-impl ToGlib for RepoMode {
-    type GlibType = ostree_sys::OstreeRepoMode;
+impl IntoGlib for RepoMode {
+    type GlibType = ffi::OstreeRepoMode;
 
-    fn to_glib(&self) -> ostree_sys::OstreeRepoMode {
-        match *self {
-            RepoMode::Bare => ostree_sys::OSTREE_REPO_MODE_BARE,
-            RepoMode::Archive => ostree_sys::OSTREE_REPO_MODE_ARCHIVE,
-            RepoMode::BareUser => ostree_sys::OSTREE_REPO_MODE_BARE_USER,
-            RepoMode::BareUserOnly => ostree_sys::OSTREE_REPO_MODE_BARE_USER_ONLY,
-            RepoMode::__Unknown(value) => value
-        }
+    fn into_glib(self) -> ffi::OstreeRepoMode {
+        match self {
+            Self::Bare => ffi::OSTREE_REPO_MODE_BARE,
+            Self::Archive => ffi::OSTREE_REPO_MODE_ARCHIVE,
+            Self::BareUser => ffi::OSTREE_REPO_MODE_BARE_USER,
+            Self::BareUserOnly => ffi::OSTREE_REPO_MODE_BARE_USER_ONLY,
+            Self::__Unknown(value) => value,
+}
     }
 }
 
 #[doc(hidden)]
-impl FromGlib<ostree_sys::OstreeRepoMode> for RepoMode {
-    fn from_glib(value: ostree_sys::OstreeRepoMode) -> Self {
+impl FromGlib<ffi::OstreeRepoMode> for RepoMode {
+    unsafe fn from_glib(value: ffi::OstreeRepoMode) -> Self {
         match value {
-            0 => RepoMode::Bare,
-            1 => RepoMode::Archive,
-            2 => RepoMode::BareUser,
-            3 => RepoMode::BareUserOnly,
-            value => RepoMode::__Unknown(value),
-        }
+            ffi::OSTREE_REPO_MODE_BARE => Self::Bare,
+            ffi::OSTREE_REPO_MODE_ARCHIVE => Self::Archive,
+            ffi::OSTREE_REPO_MODE_BARE_USER => Self::BareUser,
+            ffi::OSTREE_REPO_MODE_BARE_USER_ONLY => Self::BareUserOnly,
+            value => Self::__Unknown(value),
+}
     }
 }
 
 #[derive(Debug, Eq, PartialEq, Ord, PartialOrd, Hash)]
 #[derive(Clone, Copy)]
 #[non_exhaustive]
+#[doc(alias = "OstreeRepoRemoteChange")]
 pub enum RepoRemoteChange {
+    #[doc(alias = "OSTREE_REPO_REMOTE_CHANGE_ADD")]
     Add,
+    #[doc(alias = "OSTREE_REPO_REMOTE_CHANGE_ADD_IF_NOT_EXISTS")]
     AddIfNotExists,
+    #[doc(alias = "OSTREE_REPO_REMOTE_CHANGE_DELETE")]
     Delete,
+    #[doc(alias = "OSTREE_REPO_REMOTE_CHANGE_DELETE_IF_EXISTS")]
     DeleteIfExists,
+    #[doc(alias = "OSTREE_REPO_REMOTE_CHANGE_REPLACE")]
     Replace,
-    #[doc(hidden)]
+#[doc(hidden)]
     __Unknown(i32),
 }
 
 impl fmt::Display for RepoRemoteChange {
     fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
         write!(f, "RepoRemoteChange::{}", match *self {
-            RepoRemoteChange::Add => "Add",
-            RepoRemoteChange::AddIfNotExists => "AddIfNotExists",
-            RepoRemoteChange::Delete => "Delete",
-            RepoRemoteChange::DeleteIfExists => "DeleteIfExists",
-            RepoRemoteChange::Replace => "Replace",
+            Self::Add => "Add",
+            Self::AddIfNotExists => "AddIfNotExists",
+            Self::Delete => "Delete",
+            Self::DeleteIfExists => "DeleteIfExists",
+            Self::Replace => "Replace",
             _ => "Unknown",
         })
     }
 }
 
 #[doc(hidden)]
-impl ToGlib for RepoRemoteChange {
-    type GlibType = ostree_sys::OstreeRepoRemoteChange;
+impl IntoGlib for RepoRemoteChange {
+    type GlibType = ffi::OstreeRepoRemoteChange;
 
-    fn to_glib(&self) -> ostree_sys::OstreeRepoRemoteChange {
-        match *self {
-            RepoRemoteChange::Add => ostree_sys::OSTREE_REPO_REMOTE_CHANGE_ADD,
-            RepoRemoteChange::AddIfNotExists => ostree_sys::OSTREE_REPO_REMOTE_CHANGE_ADD_IF_NOT_EXISTS,
-            RepoRemoteChange::Delete => ostree_sys::OSTREE_REPO_REMOTE_CHANGE_DELETE,
-            RepoRemoteChange::DeleteIfExists => ostree_sys::OSTREE_REPO_REMOTE_CHANGE_DELETE_IF_EXISTS,
-            RepoRemoteChange::Replace => ostree_sys::OSTREE_REPO_REMOTE_CHANGE_REPLACE,
-            RepoRemoteChange::__Unknown(value) => value
-        }
+    fn into_glib(self) -> ffi::OstreeRepoRemoteChange {
+        match self {
+            Self::Add => ffi::OSTREE_REPO_REMOTE_CHANGE_ADD,
+            Self::AddIfNotExists => ffi::OSTREE_REPO_REMOTE_CHANGE_ADD_IF_NOT_EXISTS,
+            Self::Delete => ffi::OSTREE_REPO_REMOTE_CHANGE_DELETE,
+            Self::DeleteIfExists => ffi::OSTREE_REPO_REMOTE_CHANGE_DELETE_IF_EXISTS,
+            Self::Replace => ffi::OSTREE_REPO_REMOTE_CHANGE_REPLACE,
+            Self::__Unknown(value) => value,
+}
     }
 }
 
 #[doc(hidden)]
-impl FromGlib<ostree_sys::OstreeRepoRemoteChange> for RepoRemoteChange {
-    fn from_glib(value: ostree_sys::OstreeRepoRemoteChange) -> Self {
+impl FromGlib<ffi::OstreeRepoRemoteChange> for RepoRemoteChange {
+    unsafe fn from_glib(value: ffi::OstreeRepoRemoteChange) -> Self {
         match value {
-            0 => RepoRemoteChange::Add,
-            1 => RepoRemoteChange::AddIfNotExists,
-            2 => RepoRemoteChange::Delete,
-            3 => RepoRemoteChange::DeleteIfExists,
-            4 => RepoRemoteChange::Replace,
-            value => RepoRemoteChange::__Unknown(value),
-        }
+            ffi::OSTREE_REPO_REMOTE_CHANGE_ADD => Self::Add,
+            ffi::OSTREE_REPO_REMOTE_CHANGE_ADD_IF_NOT_EXISTS => Self::AddIfNotExists,
+            ffi::OSTREE_REPO_REMOTE_CHANGE_DELETE => Self::Delete,
+            ffi::OSTREE_REPO_REMOTE_CHANGE_DELETE_IF_EXISTS => Self::DeleteIfExists,
+            ffi::OSTREE_REPO_REMOTE_CHANGE_REPLACE => Self::Replace,
+            value => Self::__Unknown(value),
+}
     }
 }
 
 #[derive(Debug, Eq, PartialEq, Ord, PartialOrd, Hash)]
 #[derive(Clone, Copy)]
 #[non_exhaustive]
+#[doc(alias = "OstreeStaticDeltaGenerateOpt")]
 pub enum StaticDeltaGenerateOpt {
+    #[doc(alias = "OSTREE_STATIC_DELTA_GENERATE_OPT_LOWLATENCY")]
     Lowlatency,
+    #[doc(alias = "OSTREE_STATIC_DELTA_GENERATE_OPT_MAJOR")]
     Major,
-    #[doc(hidden)]
+#[doc(hidden)]
     __Unknown(i32),
 }
 
 impl fmt::Display for StaticDeltaGenerateOpt {
     fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
         write!(f, "StaticDeltaGenerateOpt::{}", match *self {
-            StaticDeltaGenerateOpt::Lowlatency => "Lowlatency",
-            StaticDeltaGenerateOpt::Major => "Major",
+            Self::Lowlatency => "Lowlatency",
+            Self::Major => "Major",
             _ => "Unknown",
         })
     }
 }
 
 #[doc(hidden)]
-impl ToGlib for StaticDeltaGenerateOpt {
-    type GlibType = ostree_sys::OstreeStaticDeltaGenerateOpt;
+impl IntoGlib for StaticDeltaGenerateOpt {
+    type GlibType = ffi::OstreeStaticDeltaGenerateOpt;
 
-    fn to_glib(&self) -> ostree_sys::OstreeStaticDeltaGenerateOpt {
-        match *self {
-            StaticDeltaGenerateOpt::Lowlatency => ostree_sys::OSTREE_STATIC_DELTA_GENERATE_OPT_LOWLATENCY,
-            StaticDeltaGenerateOpt::Major => ostree_sys::OSTREE_STATIC_DELTA_GENERATE_OPT_MAJOR,
-            StaticDeltaGenerateOpt::__Unknown(value) => value
-        }
+    fn into_glib(self) -> ffi::OstreeStaticDeltaGenerateOpt {
+        match self {
+            Self::Lowlatency => ffi::OSTREE_STATIC_DELTA_GENERATE_OPT_LOWLATENCY,
+            Self::Major => ffi::OSTREE_STATIC_DELTA_GENERATE_OPT_MAJOR,
+            Self::__Unknown(value) => value,
+}
     }
 }
 
 #[doc(hidden)]
-impl FromGlib<ostree_sys::OstreeStaticDeltaGenerateOpt> for StaticDeltaGenerateOpt {
-    fn from_glib(value: ostree_sys::OstreeStaticDeltaGenerateOpt) -> Self {
+impl FromGlib<ffi::OstreeStaticDeltaGenerateOpt> for StaticDeltaGenerateOpt {
+    unsafe fn from_glib(value: ffi::OstreeStaticDeltaGenerateOpt) -> Self {
         match value {
-            0 => StaticDeltaGenerateOpt::Lowlatency,
-            1 => StaticDeltaGenerateOpt::Major,
-            value => StaticDeltaGenerateOpt::__Unknown(value),
-        }
+            ffi::OSTREE_STATIC_DELTA_GENERATE_OPT_LOWLATENCY => Self::Lowlatency,
+            ffi::OSTREE_STATIC_DELTA_GENERATE_OPT_MAJOR => Self::Major,
+            value => Self::__Unknown(value),
+}
     }
 }
 
index 4da3f9402ef530014d6d6a49f37dce3f3280008a..ed2737451d1ff520df24839785d60ee97d56820f 100644 (file)
 // This file was generated by gir (https://github.com/gtk-rs/gir)
-// from gir-files (https://github.com/gtk-rs/gir-files)
+// from gir-files
 // DO NOT EDIT
 
+use bitflags::bitflags;
 use glib::translate::*;
 use glib::value::FromValue;
-use glib::value::FromValueOptional;
-use glib::value::SetValue;
-use glib::value::Value;
+use glib::value::ToValue;
 use glib::StaticType;
 use glib::Type;
-use gobject_sys;
-use ostree_sys;
+use std::fmt;
 
 #[cfg(any(feature = "v2017_13", feature = "dox"))]
+#[cfg_attr(feature = "dox", doc(cfg(feature = "v2017_13")))]
 bitflags! {
+    #[doc(alias = "OstreeChecksumFlags")]
     pub struct ChecksumFlags: u32 {
-        const NONE = 0;
-        const IGNORE_XATTRS = 1;
+        #[doc(alias = "OSTREE_CHECKSUM_FLAGS_NONE")]
+        const NONE = ffi::OSTREE_CHECKSUM_FLAGS_NONE as u32;
+        #[doc(alias = "OSTREE_CHECKSUM_FLAGS_IGNORE_XATTRS")]
+        const IGNORE_XATTRS = ffi::OSTREE_CHECKSUM_FLAGS_IGNORE_XATTRS as u32;
     }
 }
 
 #[cfg(any(feature = "v2017_13", feature = "dox"))]
+#[cfg_attr(feature = "dox", doc(cfg(feature = "v2017_13")))]
+impl fmt::Display for ChecksumFlags {
+    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+        <Self as fmt::Debug>::fmt(self, f)
+    }
+}
+
+#[cfg(any(feature = "v2017_13", feature = "dox"))]
+#[cfg_attr(feature = "dox", doc(cfg(feature = "v2017_13")))]
 #[doc(hidden)]
-impl ToGlib for ChecksumFlags {
-    type GlibType = ostree_sys::OstreeChecksumFlags;
+impl IntoGlib for ChecksumFlags {
+    type GlibType = ffi::OstreeChecksumFlags;
 
-    fn to_glib(&self) -> ostree_sys::OstreeChecksumFlags {
+    fn into_glib(self) -> ffi::OstreeChecksumFlags {
         self.bits()
     }
 }
 
 #[cfg(any(feature = "v2017_13", feature = "dox"))]
+#[cfg_attr(feature = "dox", doc(cfg(feature = "v2017_13")))]
 #[doc(hidden)]
-impl FromGlib<ostree_sys::OstreeChecksumFlags> for ChecksumFlags {
-    fn from_glib(value: ostree_sys::OstreeChecksumFlags) -> ChecksumFlags {
-        ChecksumFlags::from_bits_truncate(value)
+impl FromGlib<ffi::OstreeChecksumFlags> for ChecksumFlags {
+    unsafe fn from_glib(value: ffi::OstreeChecksumFlags) -> Self {
+        Self::from_bits_truncate(value)
     }
 }
 
 bitflags! {
+    #[doc(alias = "OstreeDiffFlags")]
     pub struct DiffFlags: u32 {
-        const NONE = 0;
-        const IGNORE_XATTRS = 1;
+        #[doc(alias = "OSTREE_DIFF_FLAGS_NONE")]
+        const NONE = ffi::OSTREE_DIFF_FLAGS_NONE as u32;
+        #[doc(alias = "OSTREE_DIFF_FLAGS_IGNORE_XATTRS")]
+        const IGNORE_XATTRS = ffi::OSTREE_DIFF_FLAGS_IGNORE_XATTRS as u32;
+    }
+}
+
+impl fmt::Display for DiffFlags {
+    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+        <Self as fmt::Debug>::fmt(self, f)
     }
 }
 
 #[doc(hidden)]
-impl ToGlib for DiffFlags {
-    type GlibType = ostree_sys::OstreeDiffFlags;
+impl IntoGlib for DiffFlags {
+    type GlibType = ffi::OstreeDiffFlags;
 
-    fn to_glib(&self) -> ostree_sys::OstreeDiffFlags {
+    fn into_glib(self) -> ffi::OstreeDiffFlags {
         self.bits()
     }
 }
 
 #[doc(hidden)]
-impl FromGlib<ostree_sys::OstreeDiffFlags> for DiffFlags {
-    fn from_glib(value: ostree_sys::OstreeDiffFlags) -> DiffFlags {
-        DiffFlags::from_bits_truncate(value)
+impl FromGlib<ffi::OstreeDiffFlags> for DiffFlags {
+    unsafe fn from_glib(value: ffi::OstreeDiffFlags) -> Self {
+        Self::from_bits_truncate(value)
     }
 }
 
 bitflags! {
+    #[doc(alias = "OstreeGpgSignatureFormatFlags")]
     pub struct GpgSignatureFormatFlags: u32 {
-        const GPG_SIGNATURE_FORMAT_DEFAULT = 0;
+        #[doc(alias = "OSTREE_GPG_SIGNATURE_FORMAT_DEFAULT")]
+        const GPG_SIGNATURE_FORMAT_DEFAULT = ffi::OSTREE_GPG_SIGNATURE_FORMAT_DEFAULT as u32;
+    }
+}
+
+impl fmt::Display for GpgSignatureFormatFlags {
+    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+        <Self as fmt::Debug>::fmt(self, f)
     }
 }
 
 #[doc(hidden)]
-impl ToGlib for GpgSignatureFormatFlags {
-    type GlibType = ostree_sys::OstreeGpgSignatureFormatFlags;
+impl IntoGlib for GpgSignatureFormatFlags {
+    type GlibType = ffi::OstreeGpgSignatureFormatFlags;
 
-    fn to_glib(&self) -> ostree_sys::OstreeGpgSignatureFormatFlags {
+    fn into_glib(self) -> ffi::OstreeGpgSignatureFormatFlags {
         self.bits()
     }
 }
 
 #[doc(hidden)]
-impl FromGlib<ostree_sys::OstreeGpgSignatureFormatFlags> for GpgSignatureFormatFlags {
-    fn from_glib(value: ostree_sys::OstreeGpgSignatureFormatFlags) -> GpgSignatureFormatFlags {
-        GpgSignatureFormatFlags::from_bits_truncate(value)
+impl FromGlib<ffi::OstreeGpgSignatureFormatFlags> for GpgSignatureFormatFlags {
+    unsafe fn from_glib(value: ffi::OstreeGpgSignatureFormatFlags) -> Self {
+        Self::from_bits_truncate(value)
     }
 }
 
 bitflags! {
+    #[doc(alias = "OstreeRepoCommitModifierFlags")]
     pub struct RepoCommitModifierFlags: u32 {
-        const NONE = 0;
-        const SKIP_XATTRS = 1;
-        const GENERATE_SIZES = 2;
-        const CANONICAL_PERMISSIONS = 4;
-        const ERROR_ON_UNLABELED = 8;
-        const CONSUME = 16;
-        const DEVINO_CANONICAL = 32;
+        #[doc(alias = "OSTREE_REPO_COMMIT_MODIFIER_FLAGS_NONE")]
+        const NONE = ffi::OSTREE_REPO_COMMIT_MODIFIER_FLAGS_NONE as u32;
+        #[doc(alias = "OSTREE_REPO_COMMIT_MODIFIER_FLAGS_SKIP_XATTRS")]
+        const SKIP_XATTRS = ffi::OSTREE_REPO_COMMIT_MODIFIER_FLAGS_SKIP_XATTRS as u32;
+        #[doc(alias = "OSTREE_REPO_COMMIT_MODIFIER_FLAGS_GENERATE_SIZES")]
+        const GENERATE_SIZES = ffi::OSTREE_REPO_COMMIT_MODIFIER_FLAGS_GENERATE_SIZES as u32;
+        #[doc(alias = "OSTREE_REPO_COMMIT_MODIFIER_FLAGS_CANONICAL_PERMISSIONS")]
+        const CANONICAL_PERMISSIONS = ffi::OSTREE_REPO_COMMIT_MODIFIER_FLAGS_CANONICAL_PERMISSIONS as u32;
+        #[doc(alias = "OSTREE_REPO_COMMIT_MODIFIER_FLAGS_ERROR_ON_UNLABELED")]
+        const ERROR_ON_UNLABELED = ffi::OSTREE_REPO_COMMIT_MODIFIER_FLAGS_ERROR_ON_UNLABELED as u32;
+        #[doc(alias = "OSTREE_REPO_COMMIT_MODIFIER_FLAGS_CONSUME")]
+        const CONSUME = ffi::OSTREE_REPO_COMMIT_MODIFIER_FLAGS_CONSUME as u32;
+        #[doc(alias = "OSTREE_REPO_COMMIT_MODIFIER_FLAGS_DEVINO_CANONICAL")]
+        const DEVINO_CANONICAL = ffi::OSTREE_REPO_COMMIT_MODIFIER_FLAGS_DEVINO_CANONICAL as u32;
+    }
+}
+
+impl fmt::Display for RepoCommitModifierFlags {
+    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+        <Self as fmt::Debug>::fmt(self, f)
     }
 }
 
 #[doc(hidden)]
-impl ToGlib for RepoCommitModifierFlags {
-    type GlibType = ostree_sys::OstreeRepoCommitModifierFlags;
+impl IntoGlib for RepoCommitModifierFlags {
+    type GlibType = ffi::OstreeRepoCommitModifierFlags;
 
-    fn to_glib(&self) -> ostree_sys::OstreeRepoCommitModifierFlags {
+    fn into_glib(self) -> ffi::OstreeRepoCommitModifierFlags {
         self.bits()
     }
 }
 
 #[doc(hidden)]
-impl FromGlib<ostree_sys::OstreeRepoCommitModifierFlags> for RepoCommitModifierFlags {
-    fn from_glib(value: ostree_sys::OstreeRepoCommitModifierFlags) -> RepoCommitModifierFlags {
-        RepoCommitModifierFlags::from_bits_truncate(value)
+impl FromGlib<ffi::OstreeRepoCommitModifierFlags> for RepoCommitModifierFlags {
+    unsafe fn from_glib(value: ffi::OstreeRepoCommitModifierFlags) -> Self {
+        Self::from_bits_truncate(value)
     }
 }
 
 #[cfg(any(feature = "v2015_7", feature = "dox"))]
+#[cfg_attr(feature = "dox", doc(cfg(feature = "v2015_7")))]
 bitflags! {
+    #[doc(alias = "OstreeRepoCommitState")]
     pub struct RepoCommitState: u32 {
-        const NORMAL = 0;
-        const PARTIAL = 1;
-        const FSCK_PARTIAL = 2;
+        #[doc(alias = "OSTREE_REPO_COMMIT_STATE_NORMAL")]
+        const NORMAL = ffi::OSTREE_REPO_COMMIT_STATE_NORMAL as u32;
+        #[doc(alias = "OSTREE_REPO_COMMIT_STATE_PARTIAL")]
+        const PARTIAL = ffi::OSTREE_REPO_COMMIT_STATE_PARTIAL as u32;
+        #[doc(alias = "OSTREE_REPO_COMMIT_STATE_FSCK_PARTIAL")]
+        const FSCK_PARTIAL = ffi::OSTREE_REPO_COMMIT_STATE_FSCK_PARTIAL as u32;
     }
 }
 
 #[cfg(any(feature = "v2015_7", feature = "dox"))]
+#[cfg_attr(feature = "dox", doc(cfg(feature = "v2015_7")))]
+impl fmt::Display for RepoCommitState {
+    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+        <Self as fmt::Debug>::fmt(self, f)
+    }
+}
+
+#[cfg(any(feature = "v2015_7", feature = "dox"))]
+#[cfg_attr(feature = "dox", doc(cfg(feature = "v2015_7")))]
 #[doc(hidden)]
-impl ToGlib for RepoCommitState {
-    type GlibType = ostree_sys::OstreeRepoCommitState;
+impl IntoGlib for RepoCommitState {
+    type GlibType = ffi::OstreeRepoCommitState;
 
-    fn to_glib(&self) -> ostree_sys::OstreeRepoCommitState {
+    fn into_glib(self) -> ffi::OstreeRepoCommitState {
         self.bits()
     }
 }
 
 #[cfg(any(feature = "v2015_7", feature = "dox"))]
+#[cfg_attr(feature = "dox", doc(cfg(feature = "v2015_7")))]
 #[doc(hidden)]
-impl FromGlib<ostree_sys::OstreeRepoCommitState> for RepoCommitState {
-    fn from_glib(value: ostree_sys::OstreeRepoCommitState) -> RepoCommitState {
-        RepoCommitState::from_bits_truncate(value)
+impl FromGlib<ffi::OstreeRepoCommitState> for RepoCommitState {
+    unsafe fn from_glib(value: ffi::OstreeRepoCommitState) -> Self {
+        Self::from_bits_truncate(value)
     }
 }
 
 bitflags! {
+    #[doc(alias = "OstreeRepoCommitTraverseFlags")]
     pub struct RepoCommitTraverseFlags: u32 {
-        const REPO_COMMIT_TRAVERSE_FLAG_NONE = 1;
+        #[doc(alias = "OSTREE_REPO_COMMIT_TRAVERSE_FLAG_NONE")]
+        const REPO_COMMIT_TRAVERSE_FLAG_NONE = ffi::OSTREE_REPO_COMMIT_TRAVERSE_FLAG_NONE as u32;
+    }
+}
+
+impl fmt::Display for RepoCommitTraverseFlags {
+    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+        <Self as fmt::Debug>::fmt(self, f)
     }
 }
 
 #[doc(hidden)]
-impl ToGlib for RepoCommitTraverseFlags {
-    type GlibType = ostree_sys::OstreeRepoCommitTraverseFlags;
+impl IntoGlib for RepoCommitTraverseFlags {
+    type GlibType = ffi::OstreeRepoCommitTraverseFlags;
 
-    fn to_glib(&self) -> ostree_sys::OstreeRepoCommitTraverseFlags {
+    fn into_glib(self) -> ffi::OstreeRepoCommitTraverseFlags {
         self.bits()
     }
 }
 
 #[doc(hidden)]
-impl FromGlib<ostree_sys::OstreeRepoCommitTraverseFlags> for RepoCommitTraverseFlags {
-    fn from_glib(value: ostree_sys::OstreeRepoCommitTraverseFlags) -> RepoCommitTraverseFlags {
-        RepoCommitTraverseFlags::from_bits_truncate(value)
+impl FromGlib<ffi::OstreeRepoCommitTraverseFlags> for RepoCommitTraverseFlags {
+    unsafe fn from_glib(value: ffi::OstreeRepoCommitTraverseFlags) -> Self {
+        Self::from_bits_truncate(value)
     }
 }
 
 bitflags! {
+    #[doc(alias = "OstreeRepoListObjectsFlags")]
     pub struct RepoListObjectsFlags: u32 {
-        const LOOSE = 1;
-        const PACKED = 2;
-        const ALL = 4;
-        const NO_PARENTS = 8;
+        #[doc(alias = "OSTREE_REPO_LIST_OBJECTS_LOOSE")]
+        const LOOSE = ffi::OSTREE_REPO_LIST_OBJECTS_LOOSE as u32;
+        #[doc(alias = "OSTREE_REPO_LIST_OBJECTS_PACKED")]
+        const PACKED = ffi::OSTREE_REPO_LIST_OBJECTS_PACKED as u32;
+        #[doc(alias = "OSTREE_REPO_LIST_OBJECTS_ALL")]
+        const ALL = ffi::OSTREE_REPO_LIST_OBJECTS_ALL as u32;
+        #[doc(alias = "OSTREE_REPO_LIST_OBJECTS_NO_PARENTS")]
+        const NO_PARENTS = ffi::OSTREE_REPO_LIST_OBJECTS_NO_PARENTS as u32;
+    }
+}
+
+impl fmt::Display for RepoListObjectsFlags {
+    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+        <Self as fmt::Debug>::fmt(self, f)
     }
 }
 
 #[doc(hidden)]
-impl ToGlib for RepoListObjectsFlags {
-    type GlibType = ostree_sys::OstreeRepoListObjectsFlags;
+impl IntoGlib for RepoListObjectsFlags {
+    type GlibType = ffi::OstreeRepoListObjectsFlags;
 
-    fn to_glib(&self) -> ostree_sys::OstreeRepoListObjectsFlags {
+    fn into_glib(self) -> ffi::OstreeRepoListObjectsFlags {
         self.bits()
     }
 }
 
 #[doc(hidden)]
-impl FromGlib<ostree_sys::OstreeRepoListObjectsFlags> for RepoListObjectsFlags {
-    fn from_glib(value: ostree_sys::OstreeRepoListObjectsFlags) -> RepoListObjectsFlags {
-        RepoListObjectsFlags::from_bits_truncate(value)
+impl FromGlib<ffi::OstreeRepoListObjectsFlags> for RepoListObjectsFlags {
+    unsafe fn from_glib(value: ffi::OstreeRepoListObjectsFlags) -> Self {
+        Self::from_bits_truncate(value)
     }
 }
 
 bitflags! {
+    #[doc(alias = "OstreeRepoListRefsExtFlags")]
     pub struct RepoListRefsExtFlags: u32 {
-        const NONE = 0;
-        const ALIASES = 1;
-        const EXCLUDE_REMOTES = 2;
-        const EXCLUDE_MIRRORS = 4;
+        #[doc(alias = "OSTREE_REPO_LIST_REFS_EXT_NONE")]
+        const NONE = ffi::OSTREE_REPO_LIST_REFS_EXT_NONE as u32;
+        #[doc(alias = "OSTREE_REPO_LIST_REFS_EXT_ALIASES")]
+        const ALIASES = ffi::OSTREE_REPO_LIST_REFS_EXT_ALIASES as u32;
+        #[doc(alias = "OSTREE_REPO_LIST_REFS_EXT_EXCLUDE_REMOTES")]
+        const EXCLUDE_REMOTES = ffi::OSTREE_REPO_LIST_REFS_EXT_EXCLUDE_REMOTES as u32;
+        #[doc(alias = "OSTREE_REPO_LIST_REFS_EXT_EXCLUDE_MIRRORS")]
+        const EXCLUDE_MIRRORS = ffi::OSTREE_REPO_LIST_REFS_EXT_EXCLUDE_MIRRORS as u32;
+    }
+}
+
+impl fmt::Display for RepoListRefsExtFlags {
+    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+        <Self as fmt::Debug>::fmt(self, f)
     }
 }
 
 #[doc(hidden)]
-impl ToGlib for RepoListRefsExtFlags {
-    type GlibType = ostree_sys::OstreeRepoListRefsExtFlags;
+impl IntoGlib for RepoListRefsExtFlags {
+    type GlibType = ffi::OstreeRepoListRefsExtFlags;
 
-    fn to_glib(&self) -> ostree_sys::OstreeRepoListRefsExtFlags {
+    fn into_glib(self) -> ffi::OstreeRepoListRefsExtFlags {
         self.bits()
     }
 }
 
 #[doc(hidden)]
-impl FromGlib<ostree_sys::OstreeRepoListRefsExtFlags> for RepoListRefsExtFlags {
-    fn from_glib(value: ostree_sys::OstreeRepoListRefsExtFlags) -> RepoListRefsExtFlags {
-        RepoListRefsExtFlags::from_bits_truncate(value)
+impl FromGlib<ffi::OstreeRepoListRefsExtFlags> for RepoListRefsExtFlags {
+    unsafe fn from_glib(value: ffi::OstreeRepoListRefsExtFlags) -> Self {
+        Self::from_bits_truncate(value)
     }
 }
 
 bitflags! {
+    #[doc(alias = "OstreeRepoPruneFlags")]
     pub struct RepoPruneFlags: u32 {
-        const NONE = 0;
-        const NO_PRUNE = 1;
-        const REFS_ONLY = 2;
+        #[doc(alias = "OSTREE_REPO_PRUNE_FLAGS_NONE")]
+        const NONE = ffi::OSTREE_REPO_PRUNE_FLAGS_NONE as u32;
+        #[doc(alias = "OSTREE_REPO_PRUNE_FLAGS_NO_PRUNE")]
+        const NO_PRUNE = ffi::OSTREE_REPO_PRUNE_FLAGS_NO_PRUNE as u32;
+        #[doc(alias = "OSTREE_REPO_PRUNE_FLAGS_REFS_ONLY")]
+        const REFS_ONLY = ffi::OSTREE_REPO_PRUNE_FLAGS_REFS_ONLY as u32;
+    }
+}
+
+impl fmt::Display for RepoPruneFlags {
+    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+        <Self as fmt::Debug>::fmt(self, f)
     }
 }
 
 #[doc(hidden)]
-impl ToGlib for RepoPruneFlags {
-    type GlibType = ostree_sys::OstreeRepoPruneFlags;
+impl IntoGlib for RepoPruneFlags {
+    type GlibType = ffi::OstreeRepoPruneFlags;
 
-    fn to_glib(&self) -> ostree_sys::OstreeRepoPruneFlags {
+    fn into_glib(self) -> ffi::OstreeRepoPruneFlags {
         self.bits()
     }
 }
 
 #[doc(hidden)]
-impl FromGlib<ostree_sys::OstreeRepoPruneFlags> for RepoPruneFlags {
-    fn from_glib(value: ostree_sys::OstreeRepoPruneFlags) -> RepoPruneFlags {
-        RepoPruneFlags::from_bits_truncate(value)
+impl FromGlib<ffi::OstreeRepoPruneFlags> for RepoPruneFlags {
+    unsafe fn from_glib(value: ffi::OstreeRepoPruneFlags) -> Self {
+        Self::from_bits_truncate(value)
     }
 }
 
 bitflags! {
+    #[doc(alias = "OstreeRepoPullFlags")]
     pub struct RepoPullFlags: u32 {
-        const NONE = 0;
-        const MIRROR = 1;
-        const COMMIT_ONLY = 2;
-        const UNTRUSTED = 4;
-        const BAREUSERONLY_FILES = 8;
-        const TRUSTED_HTTP = 16;
+        #[doc(alias = "OSTREE_REPO_PULL_FLAGS_NONE")]
+        const NONE = ffi::OSTREE_REPO_PULL_FLAGS_NONE as u32;
+        #[doc(alias = "OSTREE_REPO_PULL_FLAGS_MIRROR")]
+        const MIRROR = ffi::OSTREE_REPO_PULL_FLAGS_MIRROR as u32;
+        #[doc(alias = "OSTREE_REPO_PULL_FLAGS_COMMIT_ONLY")]
+        const COMMIT_ONLY = ffi::OSTREE_REPO_PULL_FLAGS_COMMIT_ONLY as u32;
+        #[doc(alias = "OSTREE_REPO_PULL_FLAGS_UNTRUSTED")]
+        const UNTRUSTED = ffi::OSTREE_REPO_PULL_FLAGS_UNTRUSTED as u32;
+        #[doc(alias = "OSTREE_REPO_PULL_FLAGS_BAREUSERONLY_FILES")]
+        const BAREUSERONLY_FILES = ffi::OSTREE_REPO_PULL_FLAGS_BAREUSERONLY_FILES as u32;
+        #[doc(alias = "OSTREE_REPO_PULL_FLAGS_TRUSTED_HTTP")]
+        const TRUSTED_HTTP = ffi::OSTREE_REPO_PULL_FLAGS_TRUSTED_HTTP as u32;
+    }
+}
+
+impl fmt::Display for RepoPullFlags {
+    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+        <Self as fmt::Debug>::fmt(self, f)
     }
 }
 
 #[doc(hidden)]
-impl ToGlib for RepoPullFlags {
-    type GlibType = ostree_sys::OstreeRepoPullFlags;
+impl IntoGlib for RepoPullFlags {
+    type GlibType = ffi::OstreeRepoPullFlags;
 
-    fn to_glib(&self) -> ostree_sys::OstreeRepoPullFlags {
+    fn into_glib(self) -> ffi::OstreeRepoPullFlags {
         self.bits()
     }
 }
 
 #[doc(hidden)]
-impl FromGlib<ostree_sys::OstreeRepoPullFlags> for RepoPullFlags {
-    fn from_glib(value: ostree_sys::OstreeRepoPullFlags) -> RepoPullFlags {
-        RepoPullFlags::from_bits_truncate(value)
+impl FromGlib<ffi::OstreeRepoPullFlags> for RepoPullFlags {
+    unsafe fn from_glib(value: ffi::OstreeRepoPullFlags) -> Self {
+        Self::from_bits_truncate(value)
     }
 }
 
 bitflags! {
+    #[doc(alias = "OstreeRepoResolveRevExtFlags")]
     pub struct RepoResolveRevExtFlags: u32 {
-        const NONE = 0;
-        const LOCAL_ONLY = 1;
+        #[doc(alias = "OSTREE_REPO_RESOLVE_REV_EXT_NONE")]
+        const NONE = ffi::OSTREE_REPO_RESOLVE_REV_EXT_NONE as u32;
+        #[doc(alias = "OSTREE_REPO_RESOLVE_REV_EXT_LOCAL_ONLY")]
+        const LOCAL_ONLY = ffi::OSTREE_REPO_RESOLVE_REV_EXT_LOCAL_ONLY as u32;
+    }
+}
+
+impl fmt::Display for RepoResolveRevExtFlags {
+    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+        <Self as fmt::Debug>::fmt(self, f)
     }
 }
 
 #[doc(hidden)]
-impl ToGlib for RepoResolveRevExtFlags {
-    type GlibType = ostree_sys::OstreeRepoResolveRevExtFlags;
+impl IntoGlib for RepoResolveRevExtFlags {
+    type GlibType = ffi::OstreeRepoResolveRevExtFlags;
 
-    fn to_glib(&self) -> ostree_sys::OstreeRepoResolveRevExtFlags {
+    fn into_glib(self) -> ffi::OstreeRepoResolveRevExtFlags {
         self.bits()
     }
 }
 
 #[doc(hidden)]
-impl FromGlib<ostree_sys::OstreeRepoResolveRevExtFlags> for RepoResolveRevExtFlags {
-    fn from_glib(value: ostree_sys::OstreeRepoResolveRevExtFlags) -> RepoResolveRevExtFlags {
-        RepoResolveRevExtFlags::from_bits_truncate(value)
+impl FromGlib<ffi::OstreeRepoResolveRevExtFlags> for RepoResolveRevExtFlags {
+    unsafe fn from_glib(value: ffi::OstreeRepoResolveRevExtFlags) -> Self {
+        Self::from_bits_truncate(value)
     }
 }
 
 bitflags! {
+    #[doc(alias = "OstreeSePolicyRestoreconFlags")]
     pub struct SePolicyRestoreconFlags: u32 {
-        const NONE = 0;
-        const ALLOW_NOLABEL = 1;
-        const KEEP_EXISTING = 2;
+        #[doc(alias = "OSTREE_SEPOLICY_RESTORECON_FLAGS_NONE")]
+        const NONE = ffi::OSTREE_SEPOLICY_RESTORECON_FLAGS_NONE as u32;
+        #[doc(alias = "OSTREE_SEPOLICY_RESTORECON_FLAGS_ALLOW_NOLABEL")]
+        const ALLOW_NOLABEL = ffi::OSTREE_SEPOLICY_RESTORECON_FLAGS_ALLOW_NOLABEL as u32;
+        #[doc(alias = "OSTREE_SEPOLICY_RESTORECON_FLAGS_KEEP_EXISTING")]
+        const KEEP_EXISTING = ffi::OSTREE_SEPOLICY_RESTORECON_FLAGS_KEEP_EXISTING as u32;
+    }
+}
+
+impl fmt::Display for SePolicyRestoreconFlags {
+    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+        <Self as fmt::Debug>::fmt(self, f)
     }
 }
 
 #[doc(hidden)]
-impl ToGlib for SePolicyRestoreconFlags {
-    type GlibType = ostree_sys::OstreeSePolicyRestoreconFlags;
+impl IntoGlib for SePolicyRestoreconFlags {
+    type GlibType = ffi::OstreeSePolicyRestoreconFlags;
 
-    fn to_glib(&self) -> ostree_sys::OstreeSePolicyRestoreconFlags {
+    fn into_glib(self) -> ffi::OstreeSePolicyRestoreconFlags {
         self.bits()
     }
 }
 
 #[doc(hidden)]
-impl FromGlib<ostree_sys::OstreeSePolicyRestoreconFlags> for SePolicyRestoreconFlags {
-    fn from_glib(value: ostree_sys::OstreeSePolicyRestoreconFlags) -> SePolicyRestoreconFlags {
-        SePolicyRestoreconFlags::from_bits_truncate(value)
+impl FromGlib<ffi::OstreeSePolicyRestoreconFlags> for SePolicyRestoreconFlags {
+    unsafe fn from_glib(value: ffi::OstreeSePolicyRestoreconFlags) -> Self {
+        Self::from_bits_truncate(value)
     }
 }
 
 bitflags! {
+    #[doc(alias = "OstreeSysrootSimpleWriteDeploymentFlags")]
     pub struct SysrootSimpleWriteDeploymentFlags: u32 {
-        const NONE = 0;
-        const RETAIN = 1;
-        const NOT_DEFAULT = 2;
-        const NO_CLEAN = 4;
-        const RETAIN_PENDING = 8;
-        const RETAIN_ROLLBACK = 16;
+        #[doc(alias = "OSTREE_SYSROOT_SIMPLE_WRITE_DEPLOYMENT_FLAGS_NONE")]
+        const NONE = ffi::OSTREE_SYSROOT_SIMPLE_WRITE_DEPLOYMENT_FLAGS_NONE as u32;
+        #[doc(alias = "OSTREE_SYSROOT_SIMPLE_WRITE_DEPLOYMENT_FLAGS_RETAIN")]
+        const RETAIN = ffi::OSTREE_SYSROOT_SIMPLE_WRITE_DEPLOYMENT_FLAGS_RETAIN as u32;
+        #[doc(alias = "OSTREE_SYSROOT_SIMPLE_WRITE_DEPLOYMENT_FLAGS_NOT_DEFAULT")]
+        const NOT_DEFAULT = ffi::OSTREE_SYSROOT_SIMPLE_WRITE_DEPLOYMENT_FLAGS_NOT_DEFAULT as u32;
+        #[doc(alias = "OSTREE_SYSROOT_SIMPLE_WRITE_DEPLOYMENT_FLAGS_NO_CLEAN")]
+        const NO_CLEAN = ffi::OSTREE_SYSROOT_SIMPLE_WRITE_DEPLOYMENT_FLAGS_NO_CLEAN as u32;
+        #[doc(alias = "OSTREE_SYSROOT_SIMPLE_WRITE_DEPLOYMENT_FLAGS_RETAIN_PENDING")]
+        const RETAIN_PENDING = ffi::OSTREE_SYSROOT_SIMPLE_WRITE_DEPLOYMENT_FLAGS_RETAIN_PENDING as u32;
+        #[doc(alias = "OSTREE_SYSROOT_SIMPLE_WRITE_DEPLOYMENT_FLAGS_RETAIN_ROLLBACK")]
+        const RETAIN_ROLLBACK = ffi::OSTREE_SYSROOT_SIMPLE_WRITE_DEPLOYMENT_FLAGS_RETAIN_ROLLBACK as u32;
+    }
+}
+
+impl fmt::Display for SysrootSimpleWriteDeploymentFlags {
+    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+        <Self as fmt::Debug>::fmt(self, f)
     }
 }
 
 #[doc(hidden)]
-impl ToGlib for SysrootSimpleWriteDeploymentFlags {
-    type GlibType = ostree_sys::OstreeSysrootSimpleWriteDeploymentFlags;
+impl IntoGlib for SysrootSimpleWriteDeploymentFlags {
+    type GlibType = ffi::OstreeSysrootSimpleWriteDeploymentFlags;
 
-    fn to_glib(&self) -> ostree_sys::OstreeSysrootSimpleWriteDeploymentFlags {
+    fn into_glib(self) -> ffi::OstreeSysrootSimpleWriteDeploymentFlags {
         self.bits()
     }
 }
 
 #[doc(hidden)]
-impl FromGlib<ostree_sys::OstreeSysrootSimpleWriteDeploymentFlags> for SysrootSimpleWriteDeploymentFlags {
-    fn from_glib(value: ostree_sys::OstreeSysrootSimpleWriteDeploymentFlags) -> SysrootSimpleWriteDeploymentFlags {
-        SysrootSimpleWriteDeploymentFlags::from_bits_truncate(value)
+impl FromGlib<ffi::OstreeSysrootSimpleWriteDeploymentFlags> for SysrootSimpleWriteDeploymentFlags {
+    unsafe fn from_glib(value: ffi::OstreeSysrootSimpleWriteDeploymentFlags) -> Self {
+        Self::from_bits_truncate(value)
     }
 }
 
 bitflags! {
+    #[doc(alias = "OstreeSysrootUpgraderFlags")]
     pub struct SysrootUpgraderFlags: u32 {
-        const IGNORE_UNCONFIGURED = 2;
+        #[doc(alias = "OSTREE_SYSROOT_UPGRADER_FLAGS_IGNORE_UNCONFIGURED")]
+        const IGNORE_UNCONFIGURED = ffi::OSTREE_SYSROOT_UPGRADER_FLAGS_IGNORE_UNCONFIGURED as u32;
+    }
+}
+
+impl fmt::Display for SysrootUpgraderFlags {
+    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+        <Self as fmt::Debug>::fmt(self, f)
     }
 }
 
 #[doc(hidden)]
-impl ToGlib for SysrootUpgraderFlags {
-    type GlibType = ostree_sys::OstreeSysrootUpgraderFlags;
+impl IntoGlib for SysrootUpgraderFlags {
+    type GlibType = ffi::OstreeSysrootUpgraderFlags;
 
-    fn to_glib(&self) -> ostree_sys::OstreeSysrootUpgraderFlags {
+    fn into_glib(self) -> ffi::OstreeSysrootUpgraderFlags {
         self.bits()
     }
 }
 
 #[doc(hidden)]
-impl FromGlib<ostree_sys::OstreeSysrootUpgraderFlags> for SysrootUpgraderFlags {
-    fn from_glib(value: ostree_sys::OstreeSysrootUpgraderFlags) -> SysrootUpgraderFlags {
-        SysrootUpgraderFlags::from_bits_truncate(value)
+impl FromGlib<ffi::OstreeSysrootUpgraderFlags> for SysrootUpgraderFlags {
+    unsafe fn from_glib(value: ffi::OstreeSysrootUpgraderFlags) -> Self {
+        Self::from_bits_truncate(value)
     }
 }
 
 impl StaticType for SysrootUpgraderFlags {
     fn static_type() -> Type {
-        unsafe { from_glib(ostree_sys::ostree_sysroot_upgrader_flags_get_type()) }
+        unsafe { from_glib(ffi::ostree_sysroot_upgrader_flags_get_type()) }
     }
 }
 
-impl<'a> FromValueOptional<'a> for SysrootUpgraderFlags {
-    unsafe fn from_value_optional(value: &Value) -> Option<Self> {
-        Some(FromValue::from_value(value))
-    }
+impl glib::value::ValueType for SysrootUpgraderFlags {
+    type Type = Self;
 }
 
-impl<'a> FromValue<'a> for SysrootUpgraderFlags {
-    unsafe fn from_value(value: &Value) -> Self {
-        from_glib(gobject_sys::g_value_get_flags(value.to_glib_none().0))
+unsafe impl<'a> FromValue<'a> for SysrootUpgraderFlags {
+    type Checker = glib::value::GenericValueTypeChecker<Self>;
+
+    unsafe fn from_value(value: &'a glib::Value) -> Self {
+        from_glib(glib::gobject_ffi::g_value_get_flags(value.to_glib_none().0))
     }
 }
 
-impl SetValue for SysrootUpgraderFlags {
-    unsafe fn set_value(value: &mut Value, this: &Self) {
-        gobject_sys::g_value_set_flags(value.to_glib_none_mut().0, this.to_glib())
+impl ToValue for SysrootUpgraderFlags {
+    fn to_value(&self) -> glib::Value {
+        let mut value = glib::Value::for_value_type::<Self>();
+        unsafe {
+            glib::gobject_ffi::g_value_set_flags(value.to_glib_none_mut().0, self.into_glib());
+        }
+        value
+    }
+
+    fn value_type(&self) -> glib::Type {
+        Self::static_type()
     }
 }
 
 bitflags! {
+    #[doc(alias = "OstreeSysrootUpgraderPullFlags")]
     pub struct SysrootUpgraderPullFlags: u32 {
-        const NONE = 0;
-        const ALLOW_OLDER = 1;
-        const SYNTHETIC = 2;
+        #[doc(alias = "OSTREE_SYSROOT_UPGRADER_PULL_FLAGS_NONE")]
+        const NONE = ffi::OSTREE_SYSROOT_UPGRADER_PULL_FLAGS_NONE as u32;
+        #[doc(alias = "OSTREE_SYSROOT_UPGRADER_PULL_FLAGS_ALLOW_OLDER")]
+        const ALLOW_OLDER = ffi::OSTREE_SYSROOT_UPGRADER_PULL_FLAGS_ALLOW_OLDER as u32;
+        #[doc(alias = "OSTREE_SYSROOT_UPGRADER_PULL_FLAGS_SYNTHETIC")]
+        const SYNTHETIC = ffi::OSTREE_SYSROOT_UPGRADER_PULL_FLAGS_SYNTHETIC as u32;
+    }
+}
+
+impl fmt::Display for SysrootUpgraderPullFlags {
+    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+        <Self as fmt::Debug>::fmt(self, f)
     }
 }
 
 #[doc(hidden)]
-impl ToGlib for SysrootUpgraderPullFlags {
-    type GlibType = ostree_sys::OstreeSysrootUpgraderPullFlags;
+impl IntoGlib for SysrootUpgraderPullFlags {
+    type GlibType = ffi::OstreeSysrootUpgraderPullFlags;
 
-    fn to_glib(&self) -> ostree_sys::OstreeSysrootUpgraderPullFlags {
+    fn into_glib(self) -> ffi::OstreeSysrootUpgraderPullFlags {
         self.bits()
     }
 }
 
 #[doc(hidden)]
-impl FromGlib<ostree_sys::OstreeSysrootUpgraderPullFlags> for SysrootUpgraderPullFlags {
-    fn from_glib(value: ostree_sys::OstreeSysrootUpgraderPullFlags) -> SysrootUpgraderPullFlags {
-        SysrootUpgraderPullFlags::from_bits_truncate(value)
+impl FromGlib<ffi::OstreeSysrootUpgraderPullFlags> for SysrootUpgraderPullFlags {
+    unsafe fn from_glib(value: ffi::OstreeSysrootUpgraderPullFlags) -> Self {
+        Self::from_bits_truncate(value)
     }
 }
 
index e643e17060ff6403fc3e9f90167603914a9169bb..cf0aa2ce6a421aa0d71b442c7c981dced7efca6c 100644 (file)
 // This file was generated by gir (https://github.com/gtk-rs/gir)
-// from gir-files (https://github.com/gtk-rs/gir-files)
+// from gir-files
 // DO NOT EDIT
 
-use gio;
-use glib;
+#[cfg(any(feature = "v2020_1", feature = "dox"))]
+#[cfg_attr(feature = "dox", doc(cfg(feature = "v2020_1")))]
+use crate::CommitSizesEntry;
+use crate::DiffFlags;
+use crate::DiffItem;
+use crate::ObjectType;
 use glib::object::IsA;
 use glib::translate::*;
-use glib::GString;
-use ostree_sys;
 use std::mem;
 use std::ptr;
-#[cfg(any(feature = "v2020_1", feature = "dox"))]
-use CommitSizesEntry;
-use DiffFlags;
-use DiffItem;
-use ObjectType;
 
 
 #[cfg(any(feature = "v2017_15", feature = "dox"))]
+#[cfg_attr(feature = "dox", doc(cfg(feature = "v2017_15")))]
+#[doc(alias = "ostree_break_hardlink")]
 pub fn break_hardlink<P: IsA<gio::Cancellable>>(dfd: i32, path: &str, skip_xattrs: bool, cancellable: Option<&P>) -> Result<(), glib::Error> {
     unsafe {
         let mut error = ptr::null_mut();
-        let _ = ostree_sys::ostree_break_hardlink(dfd, path.to_glib_none().0, skip_xattrs.to_glib(), cancellable.map(|p| p.as_ref()).to_glib_none().0, &mut error);
+        let _ = ffi::ostree_break_hardlink(dfd, path.to_glib_none().0, skip_xattrs.into_glib(), cancellable.map(|p| p.as_ref()).to_glib_none().0, &mut error);
         if error.is_null() { Ok(()) } else { Err(from_glib_full(error)) }
     }
 }
 
 #[cfg(any(feature = "v2017_4", feature = "dox"))]
+#[cfg_attr(feature = "dox", doc(cfg(feature = "v2017_4")))]
+#[doc(alias = "ostree_check_version")]
 pub fn check_version(required_year: u32, required_release: u32) -> bool {
     unsafe {
-        from_glib(ostree_sys::ostree_check_version(required_year, required_release))
+        from_glib(ffi::ostree_check_version(required_year, required_release))
     }
 }
 
+//#[doc(alias = "ostree_checksum_bytes_peek")]
 //pub fn checksum_bytes_peek(bytes: &glib::Variant) -> /*Unimplemented*/FixedArray TypeId { ns_id: 0, id: 3 }; 32 {
-//    unsafe { TODO: call ostree_sys:ostree_checksum_bytes_peek() }
+//    unsafe { TODO: call ffi:ostree_checksum_bytes_peek() }
 //}
 
+//#[doc(alias = "ostree_checksum_bytes_peek_validate")]
 //pub fn checksum_bytes_peek_validate(bytes: &glib::Variant) -> Result</*Unimplemented*/FixedArray TypeId { ns_id: 0, id: 3 }; 32, glib::Error> {
-//    unsafe { TODO: call ostree_sys:ostree_checksum_bytes_peek_validate() }
+//    unsafe { TODO: call ffi:ostree_checksum_bytes_peek_validate() }
 //}
 
-pub fn checksum_from_bytes_v(csum_v: &glib::Variant) -> Option<GString> {
+#[doc(alias = "ostree_checksum_from_bytes_v")]
+pub fn checksum_from_bytes_v(csum_v: &glib::Variant) -> Option<glib::GString> {
     unsafe {
-        from_glib_full(ostree_sys::ostree_checksum_from_bytes_v(csum_v.to_glib_none().0))
+        from_glib_full(ffi::ostree_checksum_from_bytes_v(csum_v.to_glib_none().0))
     }
 }
 
+#[doc(alias = "ostree_checksum_to_bytes_v")]
 pub fn checksum_to_bytes_v(checksum: &str) -> Option<glib::Variant> {
     unsafe {
-        from_glib_full(ostree_sys::ostree_checksum_to_bytes_v(checksum.to_glib_none().0))
+        from_glib_full(ffi::ostree_checksum_to_bytes_v(checksum.to_glib_none().0))
     }
 }
 
 #[cfg(any(feature = "v2018_2", feature = "dox"))]
-pub fn commit_get_content_checksum(commit_variant: &glib::Variant) -> Option<GString> {
+#[cfg_attr(feature = "dox", doc(cfg(feature = "v2018_2")))]
+#[doc(alias = "ostree_commit_get_content_checksum")]
+pub fn commit_get_content_checksum(commit_variant: &glib::Variant) -> Option<glib::GString> {
     unsafe {
-        from_glib_full(ostree_sys::ostree_commit_get_content_checksum(commit_variant.to_glib_none().0))
+        from_glib_full(ffi::ostree_commit_get_content_checksum(commit_variant.to_glib_none().0))
     }
 }
 
 #[cfg(any(feature = "v2020_1", feature = "dox"))]
+#[cfg_attr(feature = "dox", doc(cfg(feature = "v2020_1")))]
+#[doc(alias = "ostree_commit_get_object_sizes")]
 pub fn commit_get_object_sizes(commit_variant: &glib::Variant) -> Result<Vec<CommitSizesEntry>, glib::Error> {
     unsafe {
         let mut out_sizes_entries = ptr::null_mut();
         let mut error = ptr::null_mut();
-        let _ = ostree_sys::ostree_commit_get_object_sizes(commit_variant.to_glib_none().0, &mut out_sizes_entries, &mut error);
+        let _ = ffi::ostree_commit_get_object_sizes(commit_variant.to_glib_none().0, &mut out_sizes_entries, &mut error);
         if error.is_null() { Ok(FromGlibPtrContainer::from_glib_container(out_sizes_entries)) } else { Err(from_glib_full(error)) }
     }
 }
 
-pub fn commit_get_parent(commit_variant: &glib::Variant) -> Option<GString> {
+#[doc(alias = "ostree_commit_get_parent")]
+pub fn commit_get_parent(commit_variant: &glib::Variant) -> Option<glib::GString> {
     unsafe {
-        from_glib_full(ostree_sys::ostree_commit_get_parent(commit_variant.to_glib_none().0))
+        from_glib_full(ffi::ostree_commit_get_parent(commit_variant.to_glib_none().0))
     }
 }
 
 #[cfg(any(feature = "v2016_3", feature = "dox"))]
+#[cfg_attr(feature = "dox", doc(cfg(feature = "v2016_3")))]
+#[doc(alias = "ostree_commit_get_timestamp")]
 pub fn commit_get_timestamp(commit_variant: &glib::Variant) -> u64 {
     unsafe {
-        ostree_sys::ostree_commit_get_timestamp(commit_variant.to_glib_none().0)
+        ffi::ostree_commit_get_timestamp(commit_variant.to_glib_none().0)
     }
 }
 
 //#[cfg(any(feature = "v2021_1", feature = "dox"))]
+//#[cfg_attr(feature = "dox", doc(cfg(feature = "v2021_1")))]
+//#[doc(alias = "ostree_commit_metadata_for_bootable")]
 //pub fn commit_metadata_for_bootable<P: IsA<gio::File>, Q: IsA<gio::Cancellable>>(root: &P, dict: /*Ignored*/&glib::VariantDict, cancellable: Option<&Q>) -> Result<(), glib::Error> {
-//    unsafe { TODO: call ostree_sys:ostree_commit_metadata_for_bootable() }
+//    unsafe { TODO: call ffi:ostree_commit_metadata_for_bootable() }
 //}
 
+#[doc(alias = "ostree_content_file_parse")]
 pub fn content_file_parse<P: IsA<gio::File>, Q: IsA<gio::Cancellable>>(compressed: bool, content_path: &P, trusted: bool, cancellable: Option<&Q>) -> Result<(gio::InputStream, gio::FileInfo, glib::Variant), glib::Error> {
     unsafe {
         let mut out_input = ptr::null_mut();
         let mut out_file_info = ptr::null_mut();
         let mut out_xattrs = ptr::null_mut();
         let mut error = ptr::null_mut();
-        let _ = ostree_sys::ostree_content_file_parse(compressed.to_glib(), content_path.as_ref().to_glib_none().0, trusted.to_glib(), &mut out_input, &mut out_file_info, &mut out_xattrs, cancellable.map(|p| p.as_ref()).to_glib_none().0, &mut error);
+        let _ = ffi::ostree_content_file_parse(compressed.into_glib(), content_path.as_ref().to_glib_none().0, trusted.into_glib(), &mut out_input, &mut out_file_info, &mut out_xattrs, cancellable.map(|p| p.as_ref()).to_glib_none().0, &mut error);
         if error.is_null() { Ok((from_glib_full(out_input), from_glib_full(out_file_info), from_glib_full(out_xattrs))) } else { Err(from_glib_full(error)) }
     }
 }
 
+#[doc(alias = "ostree_content_file_parse_at")]
 pub fn content_file_parse_at<P: IsA<gio::Cancellable>>(compressed: bool, parent_dfd: i32, path: &str, trusted: bool, cancellable: Option<&P>) -> Result<(gio::InputStream, gio::FileInfo, glib::Variant), glib::Error> {
     unsafe {
         let mut out_input = ptr::null_mut();
         let mut out_file_info = ptr::null_mut();
         let mut out_xattrs = ptr::null_mut();
         let mut error = ptr::null_mut();
-        let _ = ostree_sys::ostree_content_file_parse_at(compressed.to_glib(), parent_dfd, path.to_glib_none().0, trusted.to_glib(), &mut out_input, &mut out_file_info, &mut out_xattrs, cancellable.map(|p| p.as_ref()).to_glib_none().0, &mut error);
+        let _ = ffi::ostree_content_file_parse_at(compressed.into_glib(), parent_dfd, path.to_glib_none().0, trusted.into_glib(), &mut out_input, &mut out_file_info, &mut out_xattrs, cancellable.map(|p| p.as_ref()).to_glib_none().0, &mut error);
         if error.is_null() { Ok((from_glib_full(out_input), from_glib_full(out_file_info), from_glib_full(out_xattrs))) } else { Err(from_glib_full(error)) }
     }
 }
 
+#[doc(alias = "ostree_content_stream_parse")]
 pub fn content_stream_parse<P: IsA<gio::InputStream>, Q: IsA<gio::Cancellable>>(compressed: bool, input: &P, input_length: u64, trusted: bool, cancellable: Option<&Q>) -> Result<(gio::InputStream, gio::FileInfo, glib::Variant), glib::Error> {
     unsafe {
         let mut out_input = ptr::null_mut();
         let mut out_file_info = ptr::null_mut();
         let mut out_xattrs = ptr::null_mut();
         let mut error = ptr::null_mut();
-        let _ = ostree_sys::ostree_content_stream_parse(compressed.to_glib(), input.as_ref().to_glib_none().0, input_length, trusted.to_glib(), &mut out_input, &mut out_file_info, &mut out_xattrs, cancellable.map(|p| p.as_ref()).to_glib_none().0, &mut error);
+        let _ = ffi::ostree_content_stream_parse(compressed.into_glib(), input.as_ref().to_glib_none().0, input_length, trusted.into_glib(), &mut out_input, &mut out_file_info, &mut out_xattrs, cancellable.map(|p| p.as_ref()).to_glib_none().0, &mut error);
         if error.is_null() { Ok((from_glib_full(out_input), from_glib_full(out_file_info), from_glib_full(out_xattrs))) } else { Err(from_glib_full(error)) }
     }
 }
 
+#[doc(alias = "ostree_create_directory_metadata")]
 pub fn create_directory_metadata(dir_info: &gio::FileInfo, xattrs: Option<&glib::Variant>) -> Option<glib::Variant> {
     unsafe {
-        from_glib_full(ostree_sys::ostree_create_directory_metadata(dir_info.to_glib_none().0, xattrs.to_glib_none().0))
+        from_glib_full(ffi::ostree_create_directory_metadata(dir_info.to_glib_none().0, xattrs.to_glib_none().0))
     }
 }
 
+#[doc(alias = "ostree_diff_dirs")]
 pub fn diff_dirs<P: IsA<gio::File>, Q: IsA<gio::File>, R: IsA<gio::Cancellable>>(flags: DiffFlags, a: &P, b: &Q, modified: &[&DiffItem], removed: &[gio::File], added: &[gio::File], cancellable: Option<&R>) -> Result<(), glib::Error> {
     unsafe {
         let mut error = ptr::null_mut();
-        let _ = ostree_sys::ostree_diff_dirs(flags.to_glib(), a.as_ref().to_glib_none().0, b.as_ref().to_glib_none().0, modified.to_glib_none().0, removed.to_glib_none().0, added.to_glib_none().0, cancellable.map(|p| p.as_ref()).to_glib_none().0, &mut error);
+        let _ = ffi::ostree_diff_dirs(flags.into_glib(), a.as_ref().to_glib_none().0, b.as_ref().to_glib_none().0, modified.to_glib_none().0, removed.to_glib_none().0, added.to_glib_none().0, cancellable.map(|p| p.as_ref()).to_glib_none().0, &mut error);
         if error.is_null() { Ok(()) } else { Err(from_glib_full(error)) }
     }
 }
 
 //#[cfg(any(feature = "v2017_4", feature = "dox"))]
+//#[cfg_attr(feature = "dox", doc(cfg(feature = "v2017_4")))]
+//#[doc(alias = "ostree_diff_dirs_with_options")]
 //pub fn diff_dirs_with_options<P: IsA<gio::File>, Q: IsA<gio::File>, R: IsA<gio::Cancellable>>(flags: DiffFlags, a: &P, b: &Q, modified: &[&DiffItem], removed: &[gio::File], added: &[gio::File], options: /*Ignored*/Option<&mut DiffDirsOptions>, cancellable: Option<&R>) -> Result<(), glib::Error> {
-//    unsafe { TODO: call ostree_sys:ostree_diff_dirs_with_options() }
+//    unsafe { TODO: call ffi:ostree_diff_dirs_with_options() }
 //}
 
+#[doc(alias = "ostree_diff_print")]
 pub fn diff_print<P: IsA<gio::File>, Q: IsA<gio::File>>(a: &P, b: &Q, modified: &[&DiffItem], removed: &[gio::File], added: &[gio::File]) {
     unsafe {
-        ostree_sys::ostree_diff_print(a.as_ref().to_glib_none().0, b.as_ref().to_glib_none().0, modified.to_glib_none().0, removed.to_glib_none().0, added.to_glib_none().0);
+        ffi::ostree_diff_print(a.as_ref().to_glib_none().0, b.as_ref().to_glib_none().0, modified.to_glib_none().0, removed.to_glib_none().0, added.to_glib_none().0);
     }
 }
 
 #[cfg(any(feature = "v2017_10", feature = "dox"))]
+#[cfg_attr(feature = "dox", doc(cfg(feature = "v2017_10")))]
+#[doc(alias = "ostree_gpg_error_quark")]
 pub fn gpg_error_quark() -> glib::Quark {
     unsafe {
-        from_glib(ostree_sys::ostree_gpg_error_quark())
+        from_glib(ffi::ostree_gpg_error_quark())
     }
 }
 
+#[doc(alias = "ostree_metadata_variant_type")]
 pub fn metadata_variant_type(objtype: ObjectType) -> Option<glib::VariantType> {
     unsafe {
-        from_glib_none(ostree_sys::ostree_metadata_variant_type(objtype.to_glib()))
+        from_glib_none(ffi::ostree_metadata_variant_type(objtype.into_glib()))
     }
 }
 
-pub fn object_from_string(str: &str) -> (GString, ObjectType) {
+#[doc(alias = "ostree_object_from_string")]
+pub fn object_from_string(str: &str) -> (glib::GString, ObjectType) {
     unsafe {
         let mut out_checksum = ptr::null_mut();
         let mut out_objtype = mem::MaybeUninit::uninit();
-        ostree_sys::ostree_object_from_string(str.to_glib_none().0, &mut out_checksum, out_objtype.as_mut_ptr());
+        ffi::ostree_object_from_string(str.to_glib_none().0, &mut out_checksum, out_objtype.as_mut_ptr());
         let out_objtype = out_objtype.assume_init();
         (from_glib_full(out_checksum), from_glib(out_objtype))
     }
 }
 
-pub fn object_name_deserialize(variant: &glib::Variant) -> (GString, ObjectType) {
+#[doc(alias = "ostree_object_name_deserialize")]
+pub fn object_name_deserialize(variant: &glib::Variant) -> (glib::GString, ObjectType) {
     unsafe {
         let mut out_checksum = ptr::null();
         let mut out_objtype = mem::MaybeUninit::uninit();
-        ostree_sys::ostree_object_name_deserialize(variant.to_glib_none().0, &mut out_checksum, out_objtype.as_mut_ptr());
+        ffi::ostree_object_name_deserialize(variant.to_glib_none().0, &mut out_checksum, out_objtype.as_mut_ptr());
         let out_objtype = out_objtype.assume_init();
         (from_glib_none(out_checksum), from_glib(out_objtype))
     }
 }
 
+#[doc(alias = "ostree_object_name_serialize")]
 pub fn object_name_serialize(checksum: &str, objtype: ObjectType) -> Option<glib::Variant> {
     unsafe {
-        from_glib_none(ostree_sys::ostree_object_name_serialize(checksum.to_glib_none().0, objtype.to_glib()))
+        from_glib_none(ffi::ostree_object_name_serialize(checksum.to_glib_none().0, objtype.into_glib()))
     }
 }
 
-pub fn object_to_string(checksum: &str, objtype: ObjectType) -> Option<GString> {
+#[doc(alias = "ostree_object_to_string")]
+pub fn object_to_string(checksum: &str, objtype: ObjectType) -> Option<glib::GString> {
     unsafe {
-        from_glib_full(ostree_sys::ostree_object_to_string(checksum.to_glib_none().0, objtype.to_glib()))
+        from_glib_full(ffi::ostree_object_to_string(checksum.to_glib_none().0, objtype.into_glib()))
     }
 }
 
+#[doc(alias = "ostree_object_type_from_string")]
 pub fn object_type_from_string(str: &str) -> ObjectType {
     unsafe {
-        from_glib(ostree_sys::ostree_object_type_from_string(str.to_glib_none().0))
+        from_glib(ffi::ostree_object_type_from_string(str.to_glib_none().0))
     }
 }
 
-pub fn object_type_to_string(objtype: ObjectType) -> Option<GString> {
+#[doc(alias = "ostree_object_type_to_string")]
+pub fn object_type_to_string(objtype: ObjectType) -> Option<glib::GString> {
     unsafe {
-        from_glib_none(ostree_sys::ostree_object_type_to_string(objtype.to_glib()))
+        from_glib_none(ffi::ostree_object_type_to_string(objtype.into_glib()))
     }
 }
 
-pub fn parse_refspec(refspec: &str) -> Result<(Option<GString>, GString), glib::Error> {
+#[doc(alias = "ostree_parse_refspec")]
+pub fn parse_refspec(refspec: &str) -> Result<(Option<glib::GString>, glib::GString), glib::Error> {
     unsafe {
         let mut out_remote = ptr::null_mut();
         let mut out_ref = ptr::null_mut();
         let mut error = ptr::null_mut();
-        let _ = ostree_sys::ostree_parse_refspec(refspec.to_glib_none().0, &mut out_remote, &mut out_ref, &mut error);
+        let _ = ffi::ostree_parse_refspec(refspec.to_glib_none().0, &mut out_remote, &mut out_ref, &mut error);
         if error.is_null() { Ok((from_glib_full(out_remote), from_glib_full(out_ref))) } else { Err(from_glib_full(error)) }
     }
 }
 
 #[cfg(any(feature = "v2016_6", feature = "dox"))]
+#[cfg_attr(feature = "dox", doc(cfg(feature = "v2016_6")))]
+#[doc(alias = "ostree_raw_file_to_archive_z2_stream")]
 pub fn raw_file_to_archive_z2_stream<P: IsA<gio::InputStream>, Q: IsA<gio::Cancellable>>(input: &P, file_info: &gio::FileInfo, xattrs: Option<&glib::Variant>, cancellable: Option<&Q>) -> Result<gio::InputStream, glib::Error> {
     unsafe {
         let mut out_input = ptr::null_mut();
         let mut error = ptr::null_mut();
-        let _ = ostree_sys::ostree_raw_file_to_archive_z2_stream(input.as_ref().to_glib_none().0, file_info.to_glib_none().0, xattrs.to_glib_none().0, &mut out_input, cancellable.map(|p| p.as_ref()).to_glib_none().0, &mut error);
+        let _ = ffi::ostree_raw_file_to_archive_z2_stream(input.as_ref().to_glib_none().0, file_info.to_glib_none().0, xattrs.to_glib_none().0, &mut out_input, cancellable.map(|p| p.as_ref()).to_glib_none().0, &mut error);
         if error.is_null() { Ok(from_glib_full(out_input)) } else { Err(from_glib_full(error)) }
     }
 }
 
 #[cfg(any(feature = "v2017_3", feature = "dox"))]
+#[cfg_attr(feature = "dox", doc(cfg(feature = "v2017_3")))]
+#[doc(alias = "ostree_raw_file_to_archive_z2_stream_with_options")]
 pub fn raw_file_to_archive_z2_stream_with_options<P: IsA<gio::InputStream>, Q: IsA<gio::Cancellable>>(input: &P, file_info: &gio::FileInfo, xattrs: Option<&glib::Variant>, options: Option<&glib::Variant>, cancellable: Option<&Q>) -> Result<gio::InputStream, glib::Error> {
     unsafe {
         let mut out_input = ptr::null_mut();
         let mut error = ptr::null_mut();
-        let _ = ostree_sys::ostree_raw_file_to_archive_z2_stream_with_options(input.as_ref().to_glib_none().0, file_info.to_glib_none().0, xattrs.to_glib_none().0, options.to_glib_none().0, &mut out_input, cancellable.map(|p| p.as_ref()).to_glib_none().0, &mut error);
+        let _ = ffi::ostree_raw_file_to_archive_z2_stream_with_options(input.as_ref().to_glib_none().0, file_info.to_glib_none().0, xattrs.to_glib_none().0, options.to_glib_none().0, &mut out_input, cancellable.map(|p| p.as_ref()).to_glib_none().0, &mut error);
         if error.is_null() { Ok(from_glib_full(out_input)) } else { Err(from_glib_full(error)) }
     }
 }
 
+#[doc(alias = "ostree_raw_file_to_content_stream")]
 pub fn raw_file_to_content_stream<P: IsA<gio::InputStream>, Q: IsA<gio::Cancellable>>(input: &P, file_info: &gio::FileInfo, xattrs: Option<&glib::Variant>, cancellable: Option<&Q>) -> Result<(gio::InputStream, u64), glib::Error> {
     unsafe {
         let mut out_input = ptr::null_mut();
         let mut out_length = mem::MaybeUninit::uninit();
         let mut error = ptr::null_mut();
-        let _ = ostree_sys::ostree_raw_file_to_content_stream(input.as_ref().to_glib_none().0, file_info.to_glib_none().0, xattrs.to_glib_none().0, &mut out_input, out_length.as_mut_ptr(), cancellable.map(|p| p.as_ref()).to_glib_none().0, &mut error);
+        let _ = ffi::ostree_raw_file_to_content_stream(input.as_ref().to_glib_none().0, file_info.to_glib_none().0, xattrs.to_glib_none().0, &mut out_input, out_length.as_mut_ptr(), cancellable.map(|p| p.as_ref()).to_glib_none().0, &mut error);
         let out_length = out_length.assume_init();
         if error.is_null() { Ok((from_glib_full(out_input), out_length)) } else { Err(from_glib_full(error)) }
     }
 }
 
+#[doc(alias = "ostree_validate_checksum_string")]
 pub fn validate_checksum_string(sha256: &str) -> Result<(), glib::Error> {
     unsafe {
         let mut error = ptr::null_mut();
-        let _ = ostree_sys::ostree_validate_checksum_string(sha256.to_glib_none().0, &mut error);
+        let _ = ffi::ostree_validate_checksum_string(sha256.to_glib_none().0, &mut error);
         if error.is_null() { Ok(()) } else { Err(from_glib_full(error)) }
     }
 }
 
 #[cfg(any(feature = "v2018_6", feature = "dox"))]
+#[cfg_attr(feature = "dox", doc(cfg(feature = "v2018_6")))]
+#[doc(alias = "ostree_validate_collection_id")]
 pub fn validate_collection_id(collection_id: Option<&str>) -> Result<(), glib::Error> {
     unsafe {
         let mut error = ptr::null_mut();
-        let _ = ostree_sys::ostree_validate_collection_id(collection_id.to_glib_none().0, &mut error);
+        let _ = ffi::ostree_validate_collection_id(collection_id.to_glib_none().0, &mut error);
         if error.is_null() { Ok(()) } else { Err(from_glib_full(error)) }
     }
 }
 
 #[cfg(any(feature = "v2017_8", feature = "dox"))]
+#[cfg_attr(feature = "dox", doc(cfg(feature = "v2017_8")))]
+#[doc(alias = "ostree_validate_remote_name")]
 pub fn validate_remote_name(remote_name: &str) -> Result<(), glib::Error> {
     unsafe {
         let mut error = ptr::null_mut();
-        let _ = ostree_sys::ostree_validate_remote_name(remote_name.to_glib_none().0, &mut error);
+        let _ = ffi::ostree_validate_remote_name(remote_name.to_glib_none().0, &mut error);
         if error.is_null() { Ok(()) } else { Err(from_glib_full(error)) }
     }
 }
 
+#[doc(alias = "ostree_validate_rev")]
 pub fn validate_rev(rev: &str) -> Result<(), glib::Error> {
     unsafe {
         let mut error = ptr::null_mut();
-        let _ = ostree_sys::ostree_validate_rev(rev.to_glib_none().0, &mut error);
+        let _ = ffi::ostree_validate_rev(rev.to_glib_none().0, &mut error);
         if error.is_null() { Ok(()) } else { Err(from_glib_full(error)) }
     }
 }
 
+#[doc(alias = "ostree_validate_structureof_checksum_string")]
 pub fn validate_structureof_checksum_string(checksum: &str) -> Result<(), glib::Error> {
     unsafe {
         let mut error = ptr::null_mut();
-        let _ = ostree_sys::ostree_validate_structureof_checksum_string(checksum.to_glib_none().0, &mut error);
+        let _ = ffi::ostree_validate_structureof_checksum_string(checksum.to_glib_none().0, &mut error);
         if error.is_null() { Ok(()) } else { Err(from_glib_full(error)) }
     }
 }
 
+#[doc(alias = "ostree_validate_structureof_commit")]
 pub fn validate_structureof_commit(commit: &glib::Variant) -> Result<(), glib::Error> {
     unsafe {
         let mut error = ptr::null_mut();
-        let _ = ostree_sys::ostree_validate_structureof_commit(commit.to_glib_none().0, &mut error);
+        let _ = ffi::ostree_validate_structureof_commit(commit.to_glib_none().0, &mut error);
         if error.is_null() { Ok(()) } else { Err(from_glib_full(error)) }
     }
 }
 
+#[doc(alias = "ostree_validate_structureof_csum_v")]
 pub fn validate_structureof_csum_v(checksum: &glib::Variant) -> Result<(), glib::Error> {
     unsafe {
         let mut error = ptr::null_mut();
-        let _ = ostree_sys::ostree_validate_structureof_csum_v(checksum.to_glib_none().0, &mut error);
+        let _ = ffi::ostree_validate_structureof_csum_v(checksum.to_glib_none().0, &mut error);
         if error.is_null() { Ok(()) } else { Err(from_glib_full(error)) }
     }
 }
 
+#[doc(alias = "ostree_validate_structureof_dirmeta")]
 pub fn validate_structureof_dirmeta(dirmeta: &glib::Variant) -> Result<(), glib::Error> {
     unsafe {
         let mut error = ptr::null_mut();
-        let _ = ostree_sys::ostree_validate_structureof_dirmeta(dirmeta.to_glib_none().0, &mut error);
+        let _ = ffi::ostree_validate_structureof_dirmeta(dirmeta.to_glib_none().0, &mut error);
         if error.is_null() { Ok(()) } else { Err(from_glib_full(error)) }
     }
 }
 
+#[doc(alias = "ostree_validate_structureof_dirtree")]
 pub fn validate_structureof_dirtree(dirtree: &glib::Variant) -> Result<(), glib::Error> {
     unsafe {
         let mut error = ptr::null_mut();
-        let _ = ostree_sys::ostree_validate_structureof_dirtree(dirtree.to_glib_none().0, &mut error);
+        let _ = ffi::ostree_validate_structureof_dirtree(dirtree.to_glib_none().0, &mut error);
         if error.is_null() { Ok(()) } else { Err(from_glib_full(error)) }
     }
 }
 
+#[doc(alias = "ostree_validate_structureof_file_mode")]
 pub fn validate_structureof_file_mode(mode: u32) -> Result<(), glib::Error> {
     unsafe {
         let mut error = ptr::null_mut();
-        let _ = ostree_sys::ostree_validate_structureof_file_mode(mode, &mut error);
+        let _ = ffi::ostree_validate_structureof_file_mode(mode, &mut error);
         if error.is_null() { Ok(()) } else { Err(from_glib_full(error)) }
     }
 }
 
+#[doc(alias = "ostree_validate_structureof_objtype")]
 pub fn validate_structureof_objtype(objtype: u8) -> Result<(), glib::Error> {
     unsafe {
         let mut error = ptr::null_mut();
-        let _ = ostree_sys::ostree_validate_structureof_objtype(objtype, &mut error);
+        let _ = ffi::ostree_validate_structureof_objtype(objtype, &mut error);
         if error.is_null() { Ok(()) } else { Err(from_glib_full(error)) }
     }
 }
index 3a2083a480543ed8d4904f2397f1b1afb85ad38b..ec7617b6b05bb51586629ba0e5310ec9ae21610d 100644 (file)
@@ -1,80 +1,90 @@
 // This file was generated by gir (https://github.com/gtk-rs/gir)
-// from gir-files (https://github.com/gtk-rs/gir-files)
+// from gir-files
 // DO NOT EDIT
 
-use glib;
+use crate::GpgSignatureFormatFlags;
 use glib::translate::*;
-use ostree_sys;
 use std::fmt;
 use std::mem;
 #[cfg(any(feature = "v2016_6", feature = "dox"))]
+#[cfg_attr(feature = "dox", doc(cfg(feature = "v2016_6")))]
 use std::ptr;
-use GpgSignatureFormatFlags;
 
-glib_wrapper! {
-    pub struct GpgVerifyResult(Object<ostree_sys::OstreeGpgVerifyResult, GpgVerifyResultClass>);
+glib::wrapper! {
+    #[doc(alias = "OstreeGpgVerifyResult")]
+    pub struct GpgVerifyResult(Object<ffi::OstreeGpgVerifyResult>);
 
     match fn {
-        get_type => || ostree_sys::ostree_gpg_verify_result_get_type(),
+        type_ => || ffi::ostree_gpg_verify_result_get_type(),
     }
 }
 
 impl GpgVerifyResult {
+    #[doc(alias = "ostree_gpg_verify_result_count_all")]
     pub fn count_all(&self) -> u32 {
         unsafe {
-            ostree_sys::ostree_gpg_verify_result_count_all(self.to_glib_none().0)
+            ffi::ostree_gpg_verify_result_count_all(self.to_glib_none().0)
         }
     }
 
+    #[doc(alias = "ostree_gpg_verify_result_count_valid")]
     pub fn count_valid(&self) -> u32 {
         unsafe {
-            ostree_sys::ostree_gpg_verify_result_count_valid(self.to_glib_none().0)
+            ffi::ostree_gpg_verify_result_count_valid(self.to_glib_none().0)
         }
     }
 
+    #[doc(alias = "ostree_gpg_verify_result_describe")]
     pub fn describe(&self, signature_index: u32, output_buffer: &mut glib::String, line_prefix: Option<&str>, flags: GpgSignatureFormatFlags) {
         unsafe {
-            ostree_sys::ostree_gpg_verify_result_describe(self.to_glib_none().0, signature_index, output_buffer.to_glib_none_mut().0, line_prefix.to_glib_none().0, flags.to_glib());
+            ffi::ostree_gpg_verify_result_describe(self.to_glib_none().0, signature_index, output_buffer.to_glib_none_mut().0, line_prefix.to_glib_none().0, flags.into_glib());
         }
     }
 
+    //#[doc(alias = "ostree_gpg_verify_result_get")]
     //pub fn get(&self, signature_index: u32, attrs: /*Unimplemented*/&CArray TypeId { ns_id: 1, id: 31 }) -> Option<glib::Variant> {
-    //    unsafe { TODO: call ostree_sys:ostree_gpg_verify_result_get() }
+    //    unsafe { TODO: call ffi:ostree_gpg_verify_result_get() }
     //}
 
-    pub fn get_all(&self, signature_index: u32) -> Option<glib::Variant> {
+    #[doc(alias = "ostree_gpg_verify_result_get_all")]
+    #[doc(alias = "get_all")]
+    pub fn all(&self, signature_index: u32) -> Option<glib::Variant> {
         unsafe {
-            from_glib_full(ostree_sys::ostree_gpg_verify_result_get_all(self.to_glib_none().0, signature_index))
+            from_glib_full(ffi::ostree_gpg_verify_result_get_all(self.to_glib_none().0, signature_index))
         }
     }
 
+    #[doc(alias = "ostree_gpg_verify_result_lookup")]
     pub fn lookup(&self, key_id: &str) -> Option<u32> {
         unsafe {
             let mut out_signature_index = mem::MaybeUninit::uninit();
-            let ret = from_glib(ostree_sys::ostree_gpg_verify_result_lookup(self.to_glib_none().0, key_id.to_glib_none().0, out_signature_index.as_mut_ptr()));
+            let ret = from_glib(ffi::ostree_gpg_verify_result_lookup(self.to_glib_none().0, key_id.to_glib_none().0, out_signature_index.as_mut_ptr()));
             let out_signature_index = out_signature_index.assume_init();
             if ret { Some(out_signature_index) } else { None }
         }
     }
 
     #[cfg(any(feature = "v2016_6", feature = "dox"))]
+    #[cfg_attr(feature = "dox", doc(cfg(feature = "v2016_6")))]
+    #[doc(alias = "ostree_gpg_verify_result_require_valid_signature")]
     pub fn require_valid_signature(&self) -> Result<(), glib::Error> {
         unsafe {
             let mut error = ptr::null_mut();
-            let _ = ostree_sys::ostree_gpg_verify_result_require_valid_signature(self.to_glib_none().0, &mut error);
+            let _ = ffi::ostree_gpg_verify_result_require_valid_signature(self.to_glib_none().0, &mut error);
             if error.is_null() { Ok(()) } else { Err(from_glib_full(error)) }
         }
     }
 
+    #[doc(alias = "ostree_gpg_verify_result_describe_variant")]
     pub fn describe_variant(variant: &glib::Variant, output_buffer: &mut glib::String, line_prefix: Option<&str>, flags: GpgSignatureFormatFlags) {
         unsafe {
-            ostree_sys::ostree_gpg_verify_result_describe_variant(variant.to_glib_none().0, output_buffer.to_glib_none_mut().0, line_prefix.to_glib_none().0, flags.to_glib());
+            ffi::ostree_gpg_verify_result_describe_variant(variant.to_glib_none().0, output_buffer.to_glib_none_mut().0, line_prefix.to_glib_none().0, flags.into_glib());
         }
     }
 }
 
 impl fmt::Display for GpgVerifyResult {
     fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        write!(f, "GpgVerifyResult")
+        f.write_str("GpgVerifyResult")
     }
 }
index 09eb3089e37fcea2dfb4d8022688c497382b33d0..7264e7954560eea574508730ad307cd69bb25d11 100644 (file)
 // This file was generated by gir (https://github.com/gtk-rs/gir)
-// from gir-files (https://github.com/gtk-rs/gir-files)
+// from gir-files
 // DO NOT EDIT
 
 mod async_progress;
-pub use self::async_progress::{AsyncProgress, AsyncProgressClass, NONE_ASYNC_PROGRESS};
-pub use self::async_progress::AsyncProgressExt;
+pub use self::async_progress::{AsyncProgress};
 
 mod bootconfig_parser;
-pub use self::bootconfig_parser::{BootconfigParser, BootconfigParserClass};
+pub use self::bootconfig_parser::{BootconfigParser};
 
 mod content_writer;
-pub use self::content_writer::{ContentWriter, ContentWriterClass, NONE_CONTENT_WRITER};
-pub use self::content_writer::ContentWriterExt;
+pub use self::content_writer::{ContentWriter};
 
 mod deployment;
-pub use self::deployment::{Deployment, DeploymentClass};
+pub use self::deployment::{Deployment};
 
 mod gpg_verify_result;
-pub use self::gpg_verify_result::{GpgVerifyResult, GpgVerifyResultClass};
+pub use self::gpg_verify_result::{GpgVerifyResult};
 
 mod mutable_tree;
-pub use self::mutable_tree::{MutableTree, MutableTreeClass, NONE_MUTABLE_TREE};
-pub use self::mutable_tree::MutableTreeExt;
+pub use self::mutable_tree::{MutableTree};
 
 mod repo;
-pub use self::repo::{Repo, RepoClass};
+pub use self::repo::{Repo};
 
 mod repo_file;
-pub use self::repo_file::{RepoFile, RepoFileClass, NONE_REPO_FILE};
-pub use self::repo_file::RepoFileExt;
+pub use self::repo_file::{RepoFile};
 
 #[cfg(any(feature = "v2018_6", feature = "dox"))]
+#[cfg_attr(feature = "dox", doc(cfg(feature = "v2018_6")))]
 mod repo_finder;
 #[cfg(any(feature = "v2018_6", feature = "dox"))]
+#[cfg_attr(feature = "dox", doc(cfg(feature = "v2018_6")))]
 pub use self::repo_finder::{RepoFinder, NONE_REPO_FINDER};
-#[cfg(any(feature = "v2018_6", feature = "dox"))]
-pub use self::repo_finder::RepoFinderExt;
 
 #[cfg(any(feature = "v2018_6", feature = "dox"))]
+#[cfg_attr(feature = "dox", doc(cfg(feature = "v2018_6")))]
 mod repo_finder_avahi;
 #[cfg(any(feature = "v2018_6", feature = "dox"))]
-pub use self::repo_finder_avahi::{RepoFinderAvahi, RepoFinderAvahiClass, NONE_REPO_FINDER_AVAHI};
-#[cfg(any(feature = "v2018_6", feature = "dox"))]
-pub use self::repo_finder_avahi::RepoFinderAvahiExt;
+#[cfg_attr(feature = "dox", doc(cfg(feature = "v2018_6")))]
+pub use self::repo_finder_avahi::{RepoFinderAvahi};
 
 #[cfg(any(feature = "v2018_6", feature = "dox"))]
+#[cfg_attr(feature = "dox", doc(cfg(feature = "v2018_6")))]
 mod repo_finder_config;
 #[cfg(any(feature = "v2018_6", feature = "dox"))]
-pub use self::repo_finder_config::{RepoFinderConfig, RepoFinderConfigClass, NONE_REPO_FINDER_CONFIG};
+#[cfg_attr(feature = "dox", doc(cfg(feature = "v2018_6")))]
+pub use self::repo_finder_config::{RepoFinderConfig};
 
 #[cfg(any(feature = "v2018_6", feature = "dox"))]
+#[cfg_attr(feature = "dox", doc(cfg(feature = "v2018_6")))]
 mod repo_finder_mount;
 #[cfg(any(feature = "v2018_6", feature = "dox"))]
-pub use self::repo_finder_mount::{RepoFinderMount, RepoFinderMountClass, NONE_REPO_FINDER_MOUNT};
-#[cfg(any(feature = "v2018_6", feature = "dox"))]
-pub use self::repo_finder_mount::RepoFinderMountExt;
+#[cfg_attr(feature = "dox", doc(cfg(feature = "v2018_6")))]
+pub use self::repo_finder_mount::{RepoFinderMount};
 
 #[cfg(any(feature = "v2018_6", feature = "dox"))]
+#[cfg_attr(feature = "dox", doc(cfg(feature = "v2018_6")))]
 mod repo_finder_override;
 #[cfg(any(feature = "v2018_6", feature = "dox"))]
-pub use self::repo_finder_override::{RepoFinderOverride, RepoFinderOverrideClass, NONE_REPO_FINDER_OVERRIDE};
-#[cfg(any(feature = "v2018_6", feature = "dox"))]
-pub use self::repo_finder_override::RepoFinderOverrideExt;
+#[cfg_attr(feature = "dox", doc(cfg(feature = "v2018_6")))]
+pub use self::repo_finder_override::{RepoFinderOverride};
 
 mod se_policy;
-pub use self::se_policy::{SePolicy, SePolicyClass};
+pub use self::se_policy::{SePolicy};
 
 #[cfg(any(feature = "v2020_2", feature = "dox"))]
+#[cfg_attr(feature = "dox", doc(cfg(feature = "v2020_2")))]
 mod sign;
 #[cfg(any(feature = "v2020_2", feature = "dox"))]
+#[cfg_attr(feature = "dox", doc(cfg(feature = "v2020_2")))]
 pub use self::sign::{Sign, NONE_SIGN};
-#[cfg(any(feature = "v2020_2", feature = "dox"))]
-pub use self::sign::SignExt;
 
 mod sysroot;
-pub use self::sysroot::{Sysroot, SysrootClass};
+pub use self::sysroot::{Sysroot};
 
 mod sysroot_upgrader;
-pub use self::sysroot_upgrader::{SysrootUpgrader, SysrootUpgraderClass};
+pub use self::sysroot_upgrader::{SysrootUpgrader};
 
 #[cfg(any(feature = "v2018_6", feature = "dox"))]
+#[cfg_attr(feature = "dox", doc(cfg(feature = "v2018_6")))]
 mod collection_ref;
 #[cfg(any(feature = "v2018_6", feature = "dox"))]
+#[cfg_attr(feature = "dox", doc(cfg(feature = "v2018_6")))]
 pub use self::collection_ref::CollectionRef;
 
 #[cfg(any(feature = "v2020_1", feature = "dox"))]
+#[cfg_attr(feature = "dox", doc(cfg(feature = "v2020_1")))]
 mod commit_sizes_entry;
 #[cfg(any(feature = "v2020_1", feature = "dox"))]
+#[cfg_attr(feature = "dox", doc(cfg(feature = "v2020_1")))]
 pub use self::commit_sizes_entry::CommitSizesEntry;
 
 mod diff_item;
 pub use self::diff_item::DiffItem;
 
 #[cfg(any(feature = "v2018_6", feature = "dox"))]
+#[cfg_attr(feature = "dox", doc(cfg(feature = "v2018_6")))]
 mod remote;
 #[cfg(any(feature = "v2018_6", feature = "dox"))]
+#[cfg_attr(feature = "dox", doc(cfg(feature = "v2018_6")))]
 pub use self::remote::Remote;
 
 mod repo_commit_modifier;
@@ -104,8 +108,10 @@ mod repo_dev_ino_cache;
 pub use self::repo_dev_ino_cache::RepoDevInoCache;
 
 #[cfg(any(feature = "v2018_6", feature = "dox"))]
+#[cfg_attr(feature = "dox", doc(cfg(feature = "v2018_6")))]
 mod repo_finder_result;
 #[cfg(any(feature = "v2018_6", feature = "dox"))]
+#[cfg_attr(feature = "dox", doc(cfg(feature = "v2018_6")))]
 pub use self::repo_finder_result::RepoFinderResult;
 
 mod enums;
@@ -113,6 +119,7 @@ pub use self::enums::DeploymentUnlockedState;
 pub use self::enums::GpgSignatureAttr;
 pub use self::enums::ObjectType;
 #[cfg(any(feature = "v2018_2", feature = "dox"))]
+#[cfg_attr(feature = "dox", doc(cfg(feature = "v2018_2")))]
 pub use self::enums::RepoCheckoutFilterResult;
 pub use self::enums::RepoCheckoutMode;
 pub use self::enums::RepoCheckoutOverwriteMode;
@@ -124,11 +131,13 @@ pub use self::enums::StaticDeltaGenerateOpt;
 
 mod flags;
 #[cfg(any(feature = "v2017_13", feature = "dox"))]
+#[cfg_attr(feature = "dox", doc(cfg(feature = "v2017_13")))]
 pub use self::flags::ChecksumFlags;
 pub use self::flags::DiffFlags;
 pub use self::flags::GpgSignatureFormatFlags;
 pub use self::flags::RepoCommitModifierFlags;
 #[cfg(any(feature = "v2015_7", feature = "dox"))]
+#[cfg_attr(feature = "dox", doc(cfg(feature = "v2015_7")))]
 pub use self::flags::RepoCommitState;
 pub use self::flags::RepoCommitTraverseFlags;
 pub use self::flags::RepoListObjectsFlags;
@@ -146,32 +155,45 @@ pub mod functions;
 mod constants;
 pub use self::constants::COMMIT_GVARIANT_STRING;
 #[cfg(any(feature = "v2020_4", feature = "dox"))]
+#[cfg_attr(feature = "dox", doc(cfg(feature = "v2020_4")))]
 pub use self::constants::COMMIT_META_KEY_ARCHITECTURE;
 #[cfg(any(feature = "v2018_6", feature = "dox"))]
+#[cfg_attr(feature = "dox", doc(cfg(feature = "v2018_6")))]
 pub use self::constants::COMMIT_META_KEY_COLLECTION_BINDING;
 #[cfg(any(feature = "v2017_7", feature = "dox"))]
+#[cfg_attr(feature = "dox", doc(cfg(feature = "v2017_7")))]
 pub use self::constants::COMMIT_META_KEY_ENDOFLIFE;
 #[cfg(any(feature = "v2017_7", feature = "dox"))]
+#[cfg_attr(feature = "dox", doc(cfg(feature = "v2017_7")))]
 pub use self::constants::COMMIT_META_KEY_ENDOFLIFE_REBASE;
 #[cfg(any(feature = "v2017_9", feature = "dox"))]
+#[cfg_attr(feature = "dox", doc(cfg(feature = "v2017_9")))]
 pub use self::constants::COMMIT_META_KEY_REF_BINDING;
 #[cfg(any(feature = "v2017_13", feature = "dox"))]
+#[cfg_attr(feature = "dox", doc(cfg(feature = "v2017_13")))]
 pub use self::constants::COMMIT_META_KEY_SOURCE_TITLE;
 #[cfg(any(feature = "v2014_9", feature = "dox"))]
+#[cfg_attr(feature = "dox", doc(cfg(feature = "v2014_9")))]
 pub use self::constants::COMMIT_META_KEY_VERSION;
 pub use self::constants::DIRMETA_GVARIANT_STRING;
 pub use self::constants::FILEMETA_GVARIANT_STRING;
 #[cfg(any(feature = "v2021_1", feature = "dox"))]
+#[cfg_attr(feature = "dox", doc(cfg(feature = "v2021_1")))]
 pub use self::constants::METADATA_KEY_BOOTABLE;
 #[cfg(any(feature = "v2021_1", feature = "dox"))]
+#[cfg_attr(feature = "dox", doc(cfg(feature = "v2021_1")))]
 pub use self::constants::METADATA_KEY_LINUX;
 #[cfg(any(feature = "v2018_9", feature = "dox"))]
+#[cfg_attr(feature = "dox", doc(cfg(feature = "v2018_9")))]
 pub use self::constants::META_KEY_DEPLOY_COLLECTION_ID;
 #[cfg(any(feature = "v2018_3", feature = "dox"))]
+#[cfg_attr(feature = "dox", doc(cfg(feature = "v2018_3")))]
 pub use self::constants::ORIGIN_TRANSIENT_GROUP;
 #[cfg(any(feature = "v2018_6", feature = "dox"))]
+#[cfg_attr(feature = "dox", doc(cfg(feature = "v2018_6")))]
 pub use self::constants::REPO_METADATA_REF;
 #[cfg(any(feature = "v2020_4", feature = "dox"))]
+#[cfg_attr(feature = "dox", doc(cfg(feature = "v2020_4")))]
 pub use self::constants::SIGN_NAME_ED25519;
 pub use self::constants::SUMMARY_GVARIANT_STRING;
 pub use self::constants::SUMMARY_SIG_GVARIANT_STRING;
@@ -179,18 +201,10 @@ pub use self::constants::TREE_GVARIANT_STRING;
 
 #[doc(hidden)]
 pub mod traits {
-    pub use super::AsyncProgressExt;
-    pub use super::ContentWriterExt;
-    pub use super::MutableTreeExt;
-    pub use super::RepoFileExt;
-    #[cfg(any(feature = "v2018_6", feature = "dox"))]
-    pub use super::RepoFinderExt;
-    #[cfg(any(feature = "v2018_6", feature = "dox"))]
-    pub use super::RepoFinderAvahiExt;
-    #[cfg(any(feature = "v2018_6", feature = "dox"))]
-    pub use super::RepoFinderMountExt;
     #[cfg(any(feature = "v2018_6", feature = "dox"))]
-    pub use super::RepoFinderOverrideExt;
+#[cfg_attr(feature = "dox", doc(cfg(feature = "v2018_6")))]
+    pub use super::repo_finder::RepoFinderExt;
     #[cfg(any(feature = "v2020_2", feature = "dox"))]
-    pub use super::SignExt;
+#[cfg_attr(feature = "dox", doc(cfg(feature = "v2020_2")))]
+    pub use super::sign::SignExt;
 }
index 95b76e05cdd5b8a2f1d27cf2f58cd1b96462c60c..30fd5ec8852060e77e6a93297b34ecd333a774f9 100644 (file)
 // This file was generated by gir (https://github.com/gtk-rs/gir)
-// from gir-files (https://github.com/gtk-rs/gir-files)
+// from gir-files
 // DO NOT EDIT
 
-use glib;
-use glib::object::IsA;
+#[cfg(any(feature = "v2018_7", feature = "dox"))]
+#[cfg_attr(feature = "dox", doc(cfg(feature = "v2018_7")))]
+use crate::Repo;
 use glib::translate::*;
-use glib::GString;
-use ostree_sys;
 use std::fmt;
 use std::ptr;
-#[cfg(any(feature = "v2018_7", feature = "dox"))]
-use Repo;
 
-glib_wrapper! {
-    pub struct MutableTree(Object<ostree_sys::OstreeMutableTree, ostree_sys::OstreeMutableTreeClass, MutableTreeClass>);
+glib::wrapper! {
+    #[doc(alias = "OstreeMutableTree")]
+    pub struct MutableTree(Object<ffi::OstreeMutableTree, ffi::OstreeMutableTreeClass>);
 
     match fn {
-        get_type => || ostree_sys::ostree_mutable_tree_get_type(),
+        type_ => || ffi::ostree_mutable_tree_get_type(),
     }
 }
 
 impl MutableTree {
+    #[doc(alias = "ostree_mutable_tree_new")]
     pub fn new() -> MutableTree {
         unsafe {
-            from_glib_full(ostree_sys::ostree_mutable_tree_new())
+            from_glib_full(ffi::ostree_mutable_tree_new())
         }
     }
 
     #[cfg(any(feature = "v2018_7", feature = "dox"))]
+    #[cfg_attr(feature = "dox", doc(cfg(feature = "v2018_7")))]
+    #[doc(alias = "ostree_mutable_tree_new_from_checksum")]
+    #[doc(alias = "new_from_checksum")]
     pub fn from_checksum(repo: &Repo, contents_checksum: &str, metadata_checksum: &str) -> MutableTree {
         unsafe {
-            from_glib_full(ostree_sys::ostree_mutable_tree_new_from_checksum(repo.to_glib_none().0, contents_checksum.to_glib_none().0, metadata_checksum.to_glib_none().0))
+            from_glib_full(ffi::ostree_mutable_tree_new_from_checksum(repo.to_glib_none().0, contents_checksum.to_glib_none().0, metadata_checksum.to_glib_none().0))
         }
     }
-}
-
-impl Default for MutableTree {
-    fn default() -> Self {
-        Self::new()
-    }
-}
-
-pub const NONE_MUTABLE_TREE: Option<&MutableTree> = None;
-
-pub trait MutableTreeExt: 'static {
-    #[cfg(any(feature = "v2018_7", feature = "dox"))]
-    fn check_error(&self) -> Result<(), glib::Error>;
-
-    fn ensure_dir(&self, name: &str) -> Result<MutableTree, glib::Error>;
-
-    fn ensure_parent_dirs(&self, split_path: &[&str], metadata_checksum: &str) -> Result<MutableTree, glib::Error>;
-
-    #[cfg(any(feature = "v2018_7", feature = "dox"))]
-    fn fill_empty_from_dirtree(&self, repo: &Repo, contents_checksum: &str, metadata_checksum: &str) -> bool;
-
-    fn get_contents_checksum(&self) -> Option<GString>;
 
-    //fn get_files(&self) -> /*Unknown conversion*//*Unimplemented*/HashTable TypeId { ns_id: 0, id: 28 }/TypeId { ns_id: 0, id: 28 };
-
-    fn get_metadata_checksum(&self) -> Option<GString>;
-
-    //fn get_subdirs(&self) -> /*Unknown conversion*//*Unimplemented*/HashTable TypeId { ns_id: 0, id: 28 }/TypeId { ns_id: 1, id: 44 };
-
-    fn lookup(&self, name: &str) -> Result<(GString, MutableTree), glib::Error>;
-
-    #[cfg(any(feature = "v2018_9", feature = "dox"))]
-    fn remove(&self, name: &str, allow_noent: bool) -> Result<(), glib::Error>;
-
-    fn replace_file(&self, name: &str, checksum: &str) -> Result<(), glib::Error>;
-
-    fn set_contents_checksum(&self, checksum: &str);
-
-    fn set_metadata_checksum(&self, checksum: &str);
-
-    fn walk(&self, split_path: &[&str], start: u32) -> Result<MutableTree, glib::Error>;
-}
-
-impl<O: IsA<MutableTree>> MutableTreeExt for O {
     #[cfg(any(feature = "v2018_7", feature = "dox"))]
-    fn check_error(&self) -> Result<(), glib::Error> {
+    #[cfg_attr(feature = "dox", doc(cfg(feature = "v2018_7")))]
+    #[doc(alias = "ostree_mutable_tree_check_error")]
+    pub fn check_error(&self) -> Result<(), glib::Error> {
         unsafe {
             let mut error = ptr::null_mut();
-            let _ = ostree_sys::ostree_mutable_tree_check_error(self.as_ref().to_glib_none().0, &mut error);
+            let _ = ffi::ostree_mutable_tree_check_error(self.to_glib_none().0, &mut error);
             if error.is_null() { Ok(()) } else { Err(from_glib_full(error)) }
         }
     }
 
-    fn ensure_dir(&self, name: &str) -> Result<MutableTree, glib::Error> {
+    #[doc(alias = "ostree_mutable_tree_ensure_dir")]
+    pub fn ensure_dir(&self, name: &str) -> Result<MutableTree, glib::Error> {
         unsafe {
             let mut out_subdir = ptr::null_mut();
             let mut error = ptr::null_mut();
-            let _ = ostree_sys::ostree_mutable_tree_ensure_dir(self.as_ref().to_glib_none().0, name.to_glib_none().0, &mut out_subdir, &mut error);
+            let _ = ffi::ostree_mutable_tree_ensure_dir(self.to_glib_none().0, name.to_glib_none().0, &mut out_subdir, &mut error);
             if error.is_null() { Ok(from_glib_full(out_subdir)) } else { Err(from_glib_full(error)) }
         }
     }
 
-    fn ensure_parent_dirs(&self, split_path: &[&str], metadata_checksum: &str) -> Result<MutableTree, glib::Error> {
+    #[doc(alias = "ostree_mutable_tree_ensure_parent_dirs")]
+    pub fn ensure_parent_dirs(&self, split_path: &[&str], metadata_checksum: &str) -> Result<MutableTree, glib::Error> {
         unsafe {
             let mut out_parent = ptr::null_mut();
             let mut error = ptr::null_mut();
-            let _ = ostree_sys::ostree_mutable_tree_ensure_parent_dirs(self.as_ref().to_glib_none().0, split_path.to_glib_none().0, metadata_checksum.to_glib_none().0, &mut out_parent, &mut error);
+            let _ = ffi::ostree_mutable_tree_ensure_parent_dirs(self.to_glib_none().0, split_path.to_glib_none().0, metadata_checksum.to_glib_none().0, &mut out_parent, &mut error);
             if error.is_null() { Ok(from_glib_full(out_parent)) } else { Err(from_glib_full(error)) }
         }
     }
 
     #[cfg(any(feature = "v2018_7", feature = "dox"))]
-    fn fill_empty_from_dirtree(&self, repo: &Repo, contents_checksum: &str, metadata_checksum: &str) -> bool {
+    #[cfg_attr(feature = "dox", doc(cfg(feature = "v2018_7")))]
+    #[doc(alias = "ostree_mutable_tree_fill_empty_from_dirtree")]
+    pub fn fill_empty_from_dirtree(&self, repo: &Repo, contents_checksum: &str, metadata_checksum: &str) -> bool {
         unsafe {
-            from_glib(ostree_sys::ostree_mutable_tree_fill_empty_from_dirtree(self.as_ref().to_glib_none().0, repo.to_glib_none().0, contents_checksum.to_glib_none().0, metadata_checksum.to_glib_none().0))
+            from_glib(ffi::ostree_mutable_tree_fill_empty_from_dirtree(self.to_glib_none().0, repo.to_glib_none().0, contents_checksum.to_glib_none().0, metadata_checksum.to_glib_none().0))
         }
     }
 
-    fn get_contents_checksum(&self) -> Option<GString> {
+    #[doc(alias = "ostree_mutable_tree_get_contents_checksum")]
+    #[doc(alias = "get_contents_checksum")]
+    pub fn contents_checksum(&self) -> Option<glib::GString> {
         unsafe {
-            from_glib_none(ostree_sys::ostree_mutable_tree_get_contents_checksum(self.as_ref().to_glib_none().0))
+            from_glib_none(ffi::ostree_mutable_tree_get_contents_checksum(self.to_glib_none().0))
         }
     }
 
-    //fn get_files(&self) -> /*Unknown conversion*//*Unimplemented*/HashTable TypeId { ns_id: 0, id: 28 }/TypeId { ns_id: 0, id: 28 } {
-    //    unsafe { TODO: call ostree_sys:ostree_mutable_tree_get_files() }
+    //#[doc(alias = "ostree_mutable_tree_get_files")]
+    //#[doc(alias = "get_files")]
+    //pub fn files(&self) -> /*Unknown conversion*//*Unimplemented*/HashTable TypeId { ns_id: 0, id: 28 }/TypeId { ns_id: 0, id: 28 } {
+    //    unsafe { TODO: call ffi:ostree_mutable_tree_get_files() }
     //}
 
-    fn get_metadata_checksum(&self) -> Option<GString> {
+    #[doc(alias = "ostree_mutable_tree_get_metadata_checksum")]
+    #[doc(alias = "get_metadata_checksum")]
+    pub fn metadata_checksum(&self) -> Option<glib::GString> {
         unsafe {
-            from_glib_none(ostree_sys::ostree_mutable_tree_get_metadata_checksum(self.as_ref().to_glib_none().0))
+            from_glib_none(ffi::ostree_mutable_tree_get_metadata_checksum(self.to_glib_none().0))
         }
     }
 
-    //fn get_subdirs(&self) -> /*Unknown conversion*//*Unimplemented*/HashTable TypeId { ns_id: 0, id: 28 }/TypeId { ns_id: 1, id: 44 } {
-    //    unsafe { TODO: call ostree_sys:ostree_mutable_tree_get_subdirs() }
+    //#[doc(alias = "ostree_mutable_tree_get_subdirs")]
+    //#[doc(alias = "get_subdirs")]
+    //pub fn subdirs(&self) -> /*Unknown conversion*//*Unimplemented*/HashTable TypeId { ns_id: 0, id: 28 }/TypeId { ns_id: 1, id: 44 } {
+    //    unsafe { TODO: call ffi:ostree_mutable_tree_get_subdirs() }
     //}
 
-    fn lookup(&self, name: &str) -> Result<(GString, MutableTree), glib::Error> {
+    #[doc(alias = "ostree_mutable_tree_lookup")]
+    pub fn lookup(&self, name: &str) -> Result<(glib::GString, MutableTree), glib::Error> {
         unsafe {
             let mut out_file_checksum = ptr::null_mut();
             let mut out_subdir = ptr::null_mut();
             let mut error = ptr::null_mut();
-            let _ = ostree_sys::ostree_mutable_tree_lookup(self.as_ref().to_glib_none().0, name.to_glib_none().0, &mut out_file_checksum, &mut out_subdir, &mut error);
+            let _ = ffi::ostree_mutable_tree_lookup(self.to_glib_none().0, name.to_glib_none().0, &mut out_file_checksum, &mut out_subdir, &mut error);
             if error.is_null() { Ok((from_glib_full(out_file_checksum), from_glib_full(out_subdir))) } else { Err(from_glib_full(error)) }
         }
     }
 
     #[cfg(any(feature = "v2018_9", feature = "dox"))]
-    fn remove(&self, name: &str, allow_noent: bool) -> Result<(), glib::Error> {
+    #[cfg_attr(feature = "dox", doc(cfg(feature = "v2018_9")))]
+    #[doc(alias = "ostree_mutable_tree_remove")]
+    pub fn remove(&self, name: &str, allow_noent: bool) -> Result<(), glib::Error> {
         unsafe {
             let mut error = ptr::null_mut();
-            let _ = ostree_sys::ostree_mutable_tree_remove(self.as_ref().to_glib_none().0, name.to_glib_none().0, allow_noent.to_glib(), &mut error);
+            let _ = ffi::ostree_mutable_tree_remove(self.to_glib_none().0, name.to_glib_none().0, allow_noent.into_glib(), &mut error);
             if error.is_null() { Ok(()) } else { Err(from_glib_full(error)) }
         }
     }
 
-    fn replace_file(&self, name: &str, checksum: &str) -> Result<(), glib::Error> {
+    #[doc(alias = "ostree_mutable_tree_replace_file")]
+    pub fn replace_file(&self, name: &str, checksum: &str) -> Result<(), glib::Error> {
         unsafe {
             let mut error = ptr::null_mut();
-            let _ = ostree_sys::ostree_mutable_tree_replace_file(self.as_ref().to_glib_none().0, name.to_glib_none().0, checksum.to_glib_none().0, &mut error);
+            let _ = ffi::ostree_mutable_tree_replace_file(self.to_glib_none().0, name.to_glib_none().0, checksum.to_glib_none().0, &mut error);
             if error.is_null() { Ok(()) } else { Err(from_glib_full(error)) }
         }
     }
 
-    fn set_contents_checksum(&self, checksum: &str) {
+    #[doc(alias = "ostree_mutable_tree_set_contents_checksum")]
+    pub fn set_contents_checksum(&self, checksum: &str) {
         unsafe {
-            ostree_sys::ostree_mutable_tree_set_contents_checksum(self.as_ref().to_glib_none().0, checksum.to_glib_none().0);
+            ffi::ostree_mutable_tree_set_contents_checksum(self.to_glib_none().0, checksum.to_glib_none().0);
         }
     }
 
-    fn set_metadata_checksum(&self, checksum: &str) {
+    #[doc(alias = "ostree_mutable_tree_set_metadata_checksum")]
+    pub fn set_metadata_checksum(&self, checksum: &str) {
         unsafe {
-            ostree_sys::ostree_mutable_tree_set_metadata_checksum(self.as_ref().to_glib_none().0, checksum.to_glib_none().0);
+            ffi::ostree_mutable_tree_set_metadata_checksum(self.to_glib_none().0, checksum.to_glib_none().0);
         }
     }
 
-    fn walk(&self, split_path: &[&str], start: u32) -> Result<MutableTree, glib::Error> {
+    #[doc(alias = "ostree_mutable_tree_walk")]
+    pub fn walk(&self, split_path: &[&str], start: u32) -> Result<MutableTree, glib::Error> {
         unsafe {
             let mut out_subdir = ptr::null_mut();
             let mut error = ptr::null_mut();
-            let _ = ostree_sys::ostree_mutable_tree_walk(self.as_ref().to_glib_none().0, split_path.to_glib_none().0, start, &mut out_subdir, &mut error);
+            let _ = ffi::ostree_mutable_tree_walk(self.to_glib_none().0, split_path.to_glib_none().0, start, &mut out_subdir, &mut error);
             if error.is_null() { Ok(from_glib_full(out_subdir)) } else { Err(from_glib_full(error)) }
         }
     }
 }
 
+impl Default for MutableTree {
+    fn default() -> Self {
+        Self::new()
+    }
+}
+
 impl fmt::Display for MutableTree {
     fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        write!(f, "MutableTree")
+        f.write_str("MutableTree")
     }
 }
index 93b41175a0a6c6c94e73362de05c8ed3b3116735..95939f25d40f95ba07ffa025cb02e35a2af04138 100644 (file)
@@ -1,36 +1,34 @@
 // This file was generated by gir (https://github.com/gtk-rs/gir)
-// from gir-files (https://github.com/gtk-rs/gir-files)
+// from gir-files
 // DO NOT EDIT
 
-#[cfg(any(feature = "v2018_6", feature = "dox"))]
 use glib::translate::*;
-#[cfg(any(feature = "v2018_6", feature = "dox"))]
-use glib::GString;
-use ostree_sys;
 
-glib_wrapper! {
+glib::wrapper! {
     #[derive(Debug, PartialEq, Eq, PartialOrd, Ord, Hash)]
-    pub struct Remote(Shared<ostree_sys::OstreeRemote>);
+    pub struct Remote(Shared<ffi::OstreeRemote>);
 
     match fn {
-        ref => |ptr| ostree_sys::ostree_remote_ref(ptr),
-        unref => |ptr| ostree_sys::ostree_remote_unref(ptr),
-        get_type => || ostree_sys::ostree_remote_get_type(),
+        ref => |ptr| ffi::ostree_remote_ref(ptr),
+        unref => |ptr| ffi::ostree_remote_unref(ptr),
+        type_ => || ffi::ostree_remote_get_type(),
     }
 }
 
 impl Remote {
-    #[cfg(any(feature = "v2018_6", feature = "dox"))]
-    pub fn get_name(&self) -> Option<GString> {
+    #[doc(alias = "ostree_remote_get_name")]
+    #[doc(alias = "get_name")]
+    pub fn name(&self) -> Option<glib::GString> {
         unsafe {
-            from_glib_none(ostree_sys::ostree_remote_get_name(self.to_glib_none().0))
+            from_glib_none(ffi::ostree_remote_get_name(self.to_glib_none().0))
         }
     }
 
-    #[cfg(any(feature = "v2018_6", feature = "dox"))]
-    pub fn get_url(&self) -> Option<GString> {
+    #[doc(alias = "ostree_remote_get_url")]
+    #[doc(alias = "get_url")]
+    pub fn url(&self) -> Option<glib::GString> {
         unsafe {
-            from_glib_full(ostree_sys::ostree_remote_get_url(self.to_glib_none().0))
+            from_glib_full(ffi::ostree_remote_get_url(self.to_glib_none().0))
         }
     }
 }
index f267c0c93d902f3d527908c35a08414b4d3aa113..aafe4e550d5c704a318bc6fe166b75d254752386 100644 (file)
 // This file was generated by gir (https://github.com/gtk-rs/gir)
-// from gir-files (https://github.com/gtk-rs/gir-files)
+// from gir-files
 // DO NOT EDIT
 
-use gio;
-use glib;
+use crate::AsyncProgress;
+#[cfg(any(feature = "v2018_6", feature = "dox"))]
+#[cfg_attr(feature = "dox", doc(cfg(feature = "v2018_6")))]
+use crate::CollectionRef;
+#[cfg(any(feature = "v2021_2", feature = "dox"))]
+#[cfg_attr(feature = "dox", doc(cfg(feature = "v2021_2")))]
+use crate::ContentWriter;
+use crate::GpgVerifyResult;
+use crate::MutableTree;
+use crate::ObjectType;
+#[cfg(any(feature = "v2018_6", feature = "dox"))]
+#[cfg_attr(feature = "dox", doc(cfg(feature = "v2018_6")))]
+use crate::Remote;
+#[cfg(any(feature = "v2016_8", feature = "dox"))]
+#[cfg_attr(feature = "dox", doc(cfg(feature = "v2016_8")))]
+use crate::RepoCheckoutAtOptions;
+use crate::RepoCheckoutMode;
+use crate::RepoCheckoutOverwriteMode;
+use crate::RepoCommitModifier;
+#[cfg(any(feature = "v2015_7", feature = "dox"))]
+#[cfg_attr(feature = "dox", doc(cfg(feature = "v2015_7")))]
+use crate::RepoCommitState;
+use crate::RepoFile;
+#[cfg(any(feature = "v2018_6", feature = "dox"))]
+#[cfg_attr(feature = "dox", doc(cfg(feature = "v2018_6")))]
+use crate::RepoFinderResult;
+use crate::RepoMode;
+use crate::RepoPruneFlags;
+use crate::RepoPullFlags;
+use crate::RepoRemoteChange;
+#[cfg(any(feature = "v2016_7", feature = "dox"))]
+#[cfg_attr(feature = "dox", doc(cfg(feature = "v2016_7")))]
+use crate::RepoResolveRevExtFlags;
+use crate::RepoTransactionStats;
+#[cfg(any(feature = "v2020_7", feature = "dox"))]
+#[cfg_attr(feature = "dox", doc(cfg(feature = "v2020_7")))]
+use crate::Sign;
+use crate::StaticDeltaGenerateOpt;
 use glib::object::IsA;
 use glib::object::ObjectType as ObjectType_;
 use glib::signal::connect_raw;
 use glib::signal::SignalHandlerId;
 use glib::translate::*;
-use glib::GString;
 use glib::StaticType;
-use glib::Value;
-use glib_sys;
-use gobject_sys;
-use libc;
-use ostree_sys;
-#[cfg(any(feature = "v2016_8", feature = "dox"))]
-use std;
 use std::boxed::Box as Box_;
 use std::fmt;
 use std::mem;
 use std::mem::transmute;
 use std::ptr;
-use AsyncProgress;
-#[cfg(any(feature = "v2018_6", feature = "dox"))]
-use CollectionRef;
-#[cfg(any(feature = "v2021_2", feature = "dox"))]
-use ContentWriter;
-use GpgVerifyResult;
-use MutableTree;
-use ObjectType;
-#[cfg(any(feature = "v2018_6", feature = "dox"))]
-use Remote;
-#[cfg(any(feature = "v2016_8", feature = "dox"))]
-use RepoCheckoutAtOptions;
-use RepoCheckoutMode;
-use RepoCheckoutOverwriteMode;
-use RepoCommitModifier;
-#[cfg(any(feature = "v2015_7", feature = "dox"))]
-use RepoCommitState;
-use RepoFile;
-#[cfg(any(feature = "v2018_6", feature = "dox"))]
-use RepoFinderResult;
-use RepoMode;
-use RepoPruneFlags;
-use RepoPullFlags;
-use RepoRemoteChange;
-#[cfg(any(feature = "v2016_7", feature = "dox"))]
-use RepoResolveRevExtFlags;
-use RepoTransactionStats;
-#[cfg(any(feature = "v2020_7", feature = "dox"))]
-use Sign;
-use StaticDeltaGenerateOpt;
 
-glib_wrapper! {
-    pub struct Repo(Object<ostree_sys::OstreeRepo, RepoClass>);
+glib::wrapper! {
+    #[doc(alias = "OstreeRepo")]
+    pub struct Repo(Object<ffi::OstreeRepo>);
 
     match fn {
-        get_type => || ostree_sys::ostree_repo_get_type(),
+        type_ => || ffi::ostree_repo_get_type(),
     }
 }
 
 impl Repo {
+    #[doc(alias = "ostree_repo_new")]
     pub fn new<P: IsA<gio::File>>(path: &P) -> Repo {
         unsafe {
-            from_glib_full(ostree_sys::ostree_repo_new(path.as_ref().to_glib_none().0))
+            from_glib_full(ffi::ostree_repo_new(path.as_ref().to_glib_none().0))
         }
     }
 
+    #[doc(alias = "ostree_repo_new_default")]
     pub fn new_default() -> Repo {
         unsafe {
-            from_glib_full(ostree_sys::ostree_repo_new_default())
+            from_glib_full(ffi::ostree_repo_new_default())
         }
     }
 
-    pub fn new_for_sysroot_path<P: IsA<gio::File>, Q: IsA<gio::File>>(repo_path: &P, sysroot_path: &Q) -> Repo {
+    #[doc(alias = "ostree_repo_new_for_sysroot_path")]
+    #[doc(alias = "new_for_sysroot_path")]
+    pub fn for_sysroot_path<P: IsA<gio::File>, Q: IsA<gio::File>>(repo_path: &P, sysroot_path: &Q) -> Repo {
         unsafe {
-            from_glib_full(ostree_sys::ostree_repo_new_for_sysroot_path(repo_path.as_ref().to_glib_none().0, sysroot_path.as_ref().to_glib_none().0))
+            from_glib_full(ffi::ostree_repo_new_for_sysroot_path(repo_path.as_ref().to_glib_none().0, sysroot_path.as_ref().to_glib_none().0))
         }
     }
 
+    #[doc(alias = "ostree_repo_abort_transaction")]
     pub fn abort_transaction<P: IsA<gio::Cancellable>>(&self, cancellable: Option<&P>) -> Result<(), glib::Error> {
         unsafe {
             let mut error = ptr::null_mut();
-            let _ = ostree_sys::ostree_repo_abort_transaction(self.to_glib_none().0, cancellable.map(|p| p.as_ref()).to_glib_none().0, &mut error);
+            let _ = ffi::ostree_repo_abort_transaction(self.to_glib_none().0, cancellable.map(|p| p.as_ref()).to_glib_none().0, &mut error);
             if error.is_null() { Ok(()) } else { Err(from_glib_full(error)) }
         }
     }
 
+    #[doc(alias = "ostree_repo_add_gpg_signature_summary")]
     pub fn add_gpg_signature_summary<P: IsA<gio::Cancellable>>(&self, key_id: &[&str], homedir: Option<&str>, cancellable: Option<&P>) -> Result<(), glib::Error> {
         unsafe {
             let mut error = ptr::null_mut();
-            let _ = ostree_sys::ostree_repo_add_gpg_signature_summary(self.to_glib_none().0, key_id.to_glib_none().0, homedir.to_glib_none().0, cancellable.map(|p| p.as_ref()).to_glib_none().0, &mut error);
+            let _ = ffi::ostree_repo_add_gpg_signature_summary(self.to_glib_none().0, key_id.to_glib_none().0, homedir.to_glib_none().0, cancellable.map(|p| p.as_ref()).to_glib_none().0, &mut error);
             if error.is_null() { Ok(()) } else { Err(from_glib_full(error)) }
         }
     }
 
+    #[doc(alias = "ostree_repo_append_gpg_signature")]
     pub fn append_gpg_signature<P: IsA<gio::Cancellable>>(&self, commit_checksum: &str, signature_bytes: &glib::Bytes, cancellable: Option<&P>) -> Result<(), glib::Error> {
         unsafe {
             let mut error = ptr::null_mut();
-            let _ = ostree_sys::ostree_repo_append_gpg_signature(self.to_glib_none().0, commit_checksum.to_glib_none().0, signature_bytes.to_glib_none().0, cancellable.map(|p| p.as_ref()).to_glib_none().0, &mut error);
+            let _ = ffi::ostree_repo_append_gpg_signature(self.to_glib_none().0, commit_checksum.to_glib_none().0, signature_bytes.to_glib_none().0, cancellable.map(|p| p.as_ref()).to_glib_none().0, &mut error);
             if error.is_null() { Ok(()) } else { Err(from_glib_full(error)) }
         }
     }
 
     #[cfg(any(feature = "v2016_8", feature = "dox"))]
+    #[cfg_attr(feature = "dox", doc(cfg(feature = "v2016_8")))]
+    #[doc(alias = "ostree_repo_checkout_at")]
     pub fn checkout_at<P: AsRef<std::path::Path>, Q: IsA<gio::Cancellable>>(&self, options: Option<&RepoCheckoutAtOptions>, destination_dfd: i32, destination_path: P, commit: &str, cancellable: Option<&Q>) -> Result<(), glib::Error> {
         unsafe {
             let mut error = ptr::null_mut();
-            let _ = ostree_sys::ostree_repo_checkout_at(self.to_glib_none().0, mut_override(options.to_glib_none().0), destination_dfd, destination_path.as_ref().to_glib_none().0, commit.to_glib_none().0, cancellable.map(|p| p.as_ref()).to_glib_none().0, &mut error);
+            let _ = ffi::ostree_repo_checkout_at(self.to_glib_none().0, mut_override(options.to_glib_none().0), destination_dfd, destination_path.as_ref().to_glib_none().0, commit.to_glib_none().0, cancellable.map(|p| p.as_ref()).to_glib_none().0, &mut error);
             if error.is_null() { Ok(()) } else { Err(from_glib_full(error)) }
         }
     }
 
+    #[doc(alias = "ostree_repo_checkout_gc")]
     pub fn checkout_gc<P: IsA<gio::Cancellable>>(&self, cancellable: Option<&P>) -> Result<(), glib::Error> {
         unsafe {
             let mut error = ptr::null_mut();
-            let _ = ostree_sys::ostree_repo_checkout_gc(self.to_glib_none().0, cancellable.map(|p| p.as_ref()).to_glib_none().0, &mut error);
+            let _ = ffi::ostree_repo_checkout_gc(self.to_glib_none().0, cancellable.map(|p| p.as_ref()).to_glib_none().0, &mut error);
             if error.is_null() { Ok(()) } else { Err(from_glib_full(error)) }
         }
     }
 
-    pub fn checkout_tree<P: IsA<gio::File>, Q: IsA<RepoFile>, R: IsA<gio::Cancellable>>(&self, mode: RepoCheckoutMode, overwrite_mode: RepoCheckoutOverwriteMode, destination: &P, source: &Q, source_info: &gio::FileInfo, cancellable: Option<&R>) -> Result<(), glib::Error> {
+    #[doc(alias = "ostree_repo_checkout_tree")]
+    pub fn checkout_tree<P: IsA<gio::File>, Q: IsA<gio::Cancellable>>(&self, mode: RepoCheckoutMode, overwrite_mode: RepoCheckoutOverwriteMode, destination: &P, source: &RepoFile, source_info: &gio::FileInfo, cancellable: Option<&Q>) -> Result<(), glib::Error> {
         unsafe {
             let mut error = ptr::null_mut();
-            let _ = ostree_sys::ostree_repo_checkout_tree(self.to_glib_none().0, mode.to_glib(), overwrite_mode.to_glib(), destination.as_ref().to_glib_none().0, source.as_ref().to_glib_none().0, source_info.to_glib_none().0, cancellable.map(|p| p.as_ref()).to_glib_none().0, &mut error);
+            let _ = ffi::ostree_repo_checkout_tree(self.to_glib_none().0, mode.into_glib(), overwrite_mode.into_glib(), destination.as_ref().to_glib_none().0, source.to_glib_none().0, source_info.to_glib_none().0, cancellable.map(|p| p.as_ref()).to_glib_none().0, &mut error);
             if error.is_null() { Ok(()) } else { Err(from_glib_full(error)) }
         }
     }
 
+    #[doc(alias = "ostree_repo_commit_transaction")]
     pub fn commit_transaction<P: IsA<gio::Cancellable>>(&self, cancellable: Option<&P>) -> Result<RepoTransactionStats, glib::Error> {
         unsafe {
             let mut out_stats = RepoTransactionStats::uninitialized();
             let mut error = ptr::null_mut();
-            let _ = ostree_sys::ostree_repo_commit_transaction(self.to_glib_none().0, out_stats.to_glib_none_mut().0, cancellable.map(|p| p.as_ref()).to_glib_none().0, &mut error);
+            let _ = ffi::ostree_repo_commit_transaction(self.to_glib_none().0, out_stats.to_glib_none_mut().0, cancellable.map(|p| p.as_ref()).to_glib_none().0, &mut error);
             if error.is_null() { Ok(out_stats) } else { Err(from_glib_full(error)) }
         }
     }
 
+    #[doc(alias = "ostree_repo_copy_config")]
     pub fn copy_config(&self) -> Option<glib::KeyFile> {
         unsafe {
-            from_glib_full(ostree_sys::ostree_repo_copy_config(self.to_glib_none().0))
+            from_glib_full(ffi::ostree_repo_copy_config(self.to_glib_none().0))
         }
     }
 
+    #[doc(alias = "ostree_repo_create")]
     pub fn create<P: IsA<gio::Cancellable>>(&self, mode: RepoMode, cancellable: Option<&P>) -> Result<(), glib::Error> {
         unsafe {
             let mut error = ptr::null_mut();
-            let _ = ostree_sys::ostree_repo_create(self.to_glib_none().0, mode.to_glib(), cancellable.map(|p| p.as_ref()).to_glib_none().0, &mut error);
+            let _ = ffi::ostree_repo_create(self.to_glib_none().0, mode.into_glib(), cancellable.map(|p| p.as_ref()).to_glib_none().0, &mut error);
             if error.is_null() { Ok(()) } else { Err(from_glib_full(error)) }
         }
     }
 
+    #[doc(alias = "ostree_repo_delete_object")]
     pub fn delete_object<P: IsA<gio::Cancellable>>(&self, objtype: ObjectType, sha256: &str, cancellable: Option<&P>) -> Result<(), glib::Error> {
         unsafe {
             let mut error = ptr::null_mut();
-            let _ = ostree_sys::ostree_repo_delete_object(self.to_glib_none().0, objtype.to_glib(), sha256.to_glib_none().0, cancellable.map(|p| p.as_ref()).to_glib_none().0, &mut error);
+            let _ = ffi::ostree_repo_delete_object(self.to_glib_none().0, objtype.into_glib(), sha256.to_glib_none().0, cancellable.map(|p| p.as_ref()).to_glib_none().0, &mut error);
             if error.is_null() { Ok(()) } else { Err(from_glib_full(error)) }
         }
     }
 
     #[cfg(any(feature = "v2017_12", feature = "dox"))]
+    #[cfg_attr(feature = "dox", doc(cfg(feature = "v2017_12")))]
+    #[doc(alias = "ostree_repo_equal")]
     pub fn equal(&self, b: &Repo) -> bool {
         unsafe {
-            from_glib(ostree_sys::ostree_repo_equal(self.to_glib_none().0, b.to_glib_none().0))
+            from_glib(ffi::ostree_repo_equal(self.to_glib_none().0, b.to_glib_none().0))
         }
     }
 
-    //pub fn export_tree_to_archive<P: IsA<RepoFile>, Q: IsA<gio::Cancellable>>(&self, opts: /*Ignored*/&mut RepoExportArchiveOptions, root: &P, archive: /*Unimplemented*/Option<Fundamental: Pointer>, cancellable: Option<&Q>) -> Result<(), glib::Error> {
-    //    unsafe { TODO: call ostree_sys:ostree_repo_export_tree_to_archive() }
+    //#[doc(alias = "ostree_repo_export_tree_to_archive")]
+    //pub fn export_tree_to_archive<P: IsA<gio::Cancellable>>(&self, opts: /*Ignored*/&mut RepoExportArchiveOptions, root: &RepoFile, archive: /*Unimplemented*/Option<Fundamental: Pointer>, cancellable: Option<&P>) -> Result<(), glib::Error> {
+    //    unsafe { TODO: call ffi:ostree_repo_export_tree_to_archive() }
     //}
 
     #[cfg(any(feature = "v2017_15", feature = "dox"))]
+    #[cfg_attr(feature = "dox", doc(cfg(feature = "v2017_15")))]
+    #[doc(alias = "ostree_repo_fsck_object")]
     pub fn fsck_object<P: IsA<gio::Cancellable>>(&self, objtype: ObjectType, sha256: &str, cancellable: Option<&P>) -> Result<(), glib::Error> {
         unsafe {
             let mut error = ptr::null_mut();
-            let _ = ostree_sys::ostree_repo_fsck_object(self.to_glib_none().0, objtype.to_glib(), sha256.to_glib_none().0, cancellable.map(|p| p.as_ref()).to_glib_none().0, &mut error);
+            let _ = ffi::ostree_repo_fsck_object(self.to_glib_none().0, objtype.into_glib(), sha256.to_glib_none().0, cancellable.map(|p| p.as_ref()).to_glib_none().0, &mut error);
             if error.is_null() { Ok(()) } else { Err(from_glib_full(error)) }
         }
     }
 
     #[cfg(any(feature = "v2019_2", feature = "dox"))]
-    pub fn get_bootloader(&self) -> Option<GString> {
+    #[cfg_attr(feature = "dox", doc(cfg(feature = "v2019_2")))]
+    #[doc(alias = "ostree_repo_get_bootloader")]
+    #[doc(alias = "get_bootloader")]
+    pub fn bootloader(&self) -> Option<glib::GString> {
         unsafe {
-            from_glib_none(ostree_sys::ostree_repo_get_bootloader(self.to_glib_none().0))
+            from_glib_none(ffi::ostree_repo_get_bootloader(self.to_glib_none().0))
         }
     }
 
     #[cfg(any(feature = "v2018_6", feature = "dox"))]
-    pub fn get_collection_id(&self) -> Option<GString> {
+    #[cfg_attr(feature = "dox", doc(cfg(feature = "v2018_6")))]
+    #[doc(alias = "ostree_repo_get_collection_id")]
+    #[doc(alias = "get_collection_id")]
+    pub fn collection_id(&self) -> Option<glib::GString> {
         unsafe {
-            from_glib_none(ostree_sys::ostree_repo_get_collection_id(self.to_glib_none().0))
+            from_glib_none(ffi::ostree_repo_get_collection_id(self.to_glib_none().0))
         }
     }
 
-    pub fn get_config(&self) -> Option<glib::KeyFile> {
+    #[doc(alias = "ostree_repo_get_config")]
+    #[doc(alias = "get_config")]
+    pub fn config(&self) -> Option<glib::KeyFile> {
         unsafe {
-            from_glib_none(ostree_sys::ostree_repo_get_config(self.to_glib_none().0))
+            from_glib_none(ffi::ostree_repo_get_config(self.to_glib_none().0))
         }
     }
 
     #[cfg(any(feature = "v2018_9", feature = "dox"))]
-    pub fn get_default_repo_finders(&self) -> Vec<GString> {
+    #[cfg_attr(feature = "dox", doc(cfg(feature = "v2018_9")))]
+    #[doc(alias = "ostree_repo_get_default_repo_finders")]
+    #[doc(alias = "get_default_repo_finders")]
+    pub fn default_repo_finders(&self) -> Vec<glib::GString> {
         unsafe {
-            FromGlibPtrContainer::from_glib_none(ostree_sys::ostree_repo_get_default_repo_finders(self.to_glib_none().0))
+            FromGlibPtrContainer::from_glib_none(ffi::ostree_repo_get_default_repo_finders(self.to_glib_none().0))
         }
     }
 
     #[cfg(any(feature = "v2016_4", feature = "dox"))]
-    pub fn get_dfd(&self) -> i32 {
+    #[cfg_attr(feature = "dox", doc(cfg(feature = "v2016_4")))]
+    #[doc(alias = "ostree_repo_get_dfd")]
+    #[doc(alias = "get_dfd")]
+    pub fn dfd(&self) -> i32 {
         unsafe {
-            ostree_sys::ostree_repo_get_dfd(self.to_glib_none().0)
+            ffi::ostree_repo_get_dfd(self.to_glib_none().0)
         }
     }
 
-    pub fn get_disable_fsync(&self) -> bool {
+    #[doc(alias = "ostree_repo_get_disable_fsync")]
+    #[doc(alias = "get_disable_fsync")]
+    pub fn is_disable_fsync(&self) -> bool {
         unsafe {
-            from_glib(ostree_sys::ostree_repo_get_disable_fsync(self.to_glib_none().0))
+            from_glib(ffi::ostree_repo_get_disable_fsync(self.to_glib_none().0))
         }
     }
 
     #[cfg(any(feature = "v2018_9", feature = "dox"))]
-    pub fn get_min_free_space_bytes(&self) -> Result<u64, glib::Error> {
+    #[cfg_attr(feature = "dox", doc(cfg(feature = "v2018_9")))]
+    #[doc(alias = "ostree_repo_get_min_free_space_bytes")]
+    #[doc(alias = "get_min_free_space_bytes")]
+    pub fn min_free_space_bytes(&self) -> Result<u64, glib::Error> {
         unsafe {
             let mut out_reserved_bytes = mem::MaybeUninit::uninit();
             let mut error = ptr::null_mut();
-            let _ = ostree_sys::ostree_repo_get_min_free_space_bytes(self.to_glib_none().0, out_reserved_bytes.as_mut_ptr(), &mut error);
+            let _ = ffi::ostree_repo_get_min_free_space_bytes(self.to_glib_none().0, out_reserved_bytes.as_mut_ptr(), &mut error);
             let out_reserved_bytes = out_reserved_bytes.assume_init();
             if error.is_null() { Ok(out_reserved_bytes) } else { Err(from_glib_full(error)) }
         }
     }
 
-    pub fn get_mode(&self) -> RepoMode {
+    #[doc(alias = "ostree_repo_get_mode")]
+    #[doc(alias = "get_mode")]
+    pub fn mode(&self) -> RepoMode {
         unsafe {
-            from_glib(ostree_sys::ostree_repo_get_mode(self.to_glib_none().0))
+            from_glib(ffi::ostree_repo_get_mode(self.to_glib_none().0))
         }
     }
 
-    pub fn get_parent(&self) -> Option<Repo> {
+    #[doc(alias = "ostree_repo_get_parent")]
+    #[doc(alias = "get_parent")]
+    pub fn parent(&self) -> Option<Repo> {
         unsafe {
-            from_glib_none(ostree_sys::ostree_repo_get_parent(self.to_glib_none().0))
+            from_glib_none(ffi::ostree_repo_get_parent(self.to_glib_none().0))
         }
     }
 
-    pub fn get_path(&self) -> Option<gio::File> {
+    #[doc(alias = "ostree_repo_get_path")]
+    #[doc(alias = "get_path")]
+    pub fn path(&self) -> Option<gio::File> {
         unsafe {
-            from_glib_none(ostree_sys::ostree_repo_get_path(self.to_glib_none().0))
+            from_glib_none(ffi::ostree_repo_get_path(self.to_glib_none().0))
         }
     }
 
     #[cfg(any(feature = "v2016_5", feature = "dox"))]
-    pub fn get_remote_boolean_option(&self, remote_name: &str, option_name: &str, default_value: bool) -> Result<bool, glib::Error> {
+    #[cfg_attr(feature = "dox", doc(cfg(feature = "v2016_5")))]
+    #[doc(alias = "ostree_repo_get_remote_boolean_option")]
+    #[doc(alias = "get_remote_boolean_option")]
+    pub fn remote_boolean_option(&self, remote_name: &str, option_name: &str, default_value: bool) -> Result<bool, glib::Error> {
         unsafe {
             let mut out_value = mem::MaybeUninit::uninit();
             let mut error = ptr::null_mut();
-            let _ = ostree_sys::ostree_repo_get_remote_boolean_option(self.to_glib_none().0, remote_name.to_glib_none().0, option_name.to_glib_none().0, default_value.to_glib(), out_value.as_mut_ptr(), &mut error);
+            let _ = ffi::ostree_repo_get_remote_boolean_option(self.to_glib_none().0, remote_name.to_glib_none().0, option_name.to_glib_none().0, default_value.into_glib(), out_value.as_mut_ptr(), &mut error);
             let out_value = out_value.assume_init();
             if error.is_null() { Ok(from_glib(out_value)) } else { Err(from_glib_full(error)) }
         }
     }
 
     #[cfg(any(feature = "v2016_5", feature = "dox"))]
-    pub fn get_remote_list_option(&self, remote_name: &str, option_name: &str) -> Result<Vec<GString>, glib::Error> {
+    #[cfg_attr(feature = "dox", doc(cfg(feature = "v2016_5")))]
+    #[doc(alias = "ostree_repo_get_remote_list_option")]
+    #[doc(alias = "get_remote_list_option")]
+    pub fn remote_list_option(&self, remote_name: &str, option_name: &str) -> Result<Vec<glib::GString>, glib::Error> {
         unsafe {
             let mut out_value = ptr::null_mut();
             let mut error = ptr::null_mut();
-            let _ = ostree_sys::ostree_repo_get_remote_list_option(self.to_glib_none().0, remote_name.to_glib_none().0, option_name.to_glib_none().0, &mut out_value, &mut error);
+            let _ = ffi::ostree_repo_get_remote_list_option(self.to_glib_none().0, remote_name.to_glib_none().0, option_name.to_glib_none().0, &mut out_value, &mut error);
             if error.is_null() { Ok(FromGlibPtrContainer::from_glib_full(out_value)) } else { Err(from_glib_full(error)) }
         }
     }
 
     #[cfg(any(feature = "v2016_5", feature = "dox"))]
-    pub fn get_remote_option(&self, remote_name: &str, option_name: &str, default_value: Option<&str>) -> Result<GString, glib::Error> {
+    #[cfg_attr(feature = "dox", doc(cfg(feature = "v2016_5")))]
+    #[doc(alias = "ostree_repo_get_remote_option")]
+    #[doc(alias = "get_remote_option")]
+    pub fn remote_option(&self, remote_name: &str, option_name: &str, default_value: Option<&str>) -> Result<glib::GString, glib::Error> {
         unsafe {
             let mut out_value = ptr::null_mut();
             let mut error = ptr::null_mut();
-            let _ = ostree_sys::ostree_repo_get_remote_option(self.to_glib_none().0, remote_name.to_glib_none().0, option_name.to_glib_none().0, default_value.to_glib_none().0, &mut out_value, &mut error);
+            let _ = ffi::ostree_repo_get_remote_option(self.to_glib_none().0, remote_name.to_glib_none().0, option_name.to_glib_none().0, default_value.to_glib_none().0, &mut out_value, &mut error);
             if error.is_null() { Ok(from_glib_full(out_value)) } else { Err(from_glib_full(error)) }
         }
     }
 
     #[cfg(any(feature = "v2020_8", feature = "dox"))]
+    #[cfg_attr(feature = "dox", doc(cfg(feature = "v2020_8")))]
+    #[doc(alias = "ostree_repo_gpg_sign_data")]
     pub fn gpg_sign_data<P: IsA<gio::Cancellable>>(&self, data: &glib::Bytes, old_signatures: &glib::Bytes, key_id: &[&str], homedir: Option<&str>, cancellable: Option<&P>) -> Result<glib::Bytes, glib::Error> {
         unsafe {
             let mut out_signatures = ptr::null_mut();
             let mut error = ptr::null_mut();
-            let _ = ostree_sys::ostree_repo_gpg_sign_data(self.to_glib_none().0, data.to_glib_none().0, old_signatures.to_glib_none().0, key_id.to_glib_none().0, homedir.to_glib_none().0, &mut out_signatures, cancellable.map(|p| p.as_ref()).to_glib_none().0, &mut error);
+            let _ = ffi::ostree_repo_gpg_sign_data(self.to_glib_none().0, data.to_glib_none().0, old_signatures.to_glib_none().0, key_id.to_glib_none().0, homedir.to_glib_none().0, &mut out_signatures, cancellable.map(|p| p.as_ref()).to_glib_none().0, &mut error);
             if error.is_null() { Ok(from_glib_full(out_signatures)) } else { Err(from_glib_full(error)) }
         }
     }
 
     #[cfg(any(feature = "v2016_6", feature = "dox"))]
+    #[cfg_attr(feature = "dox", doc(cfg(feature = "v2016_6")))]
+    #[doc(alias = "ostree_repo_gpg_verify_data")]
     pub fn gpg_verify_data<P: IsA<gio::File>, Q: IsA<gio::File>, R: IsA<gio::Cancellable>>(&self, remote_name: Option<&str>, data: &glib::Bytes, signatures: &glib::Bytes, keyringdir: Option<&P>, extra_keyring: Option<&Q>, cancellable: Option<&R>) -> Result<GpgVerifyResult, glib::Error> {
         unsafe {
             let mut error = ptr::null_mut();
-            let ret = ostree_sys::ostree_repo_gpg_verify_data(self.to_glib_none().0, remote_name.to_glib_none().0, data.to_glib_none().0, signatures.to_glib_none().0, keyringdir.map(|p| p.as_ref()).to_glib_none().0, extra_keyring.map(|p| p.as_ref()).to_glib_none().0, cancellable.map(|p| p.as_ref()).to_glib_none().0, &mut error);
+            let ret = ffi::ostree_repo_gpg_verify_data(self.to_glib_none().0, remote_name.to_glib_none().0, data.to_glib_none().0, signatures.to_glib_none().0, keyringdir.map(|p| p.as_ref()).to_glib_none().0, extra_keyring.map(|p| p.as_ref()).to_glib_none().0, cancellable.map(|p| p.as_ref()).to_glib_none().0, &mut error);
             if error.is_null() { Ok(from_glib_full(ret)) } else { Err(from_glib_full(error)) }
         }
     }
 
+    #[doc(alias = "ostree_repo_has_object")]
     pub fn has_object<P: IsA<gio::Cancellable>>(&self, objtype: ObjectType, checksum: &str, cancellable: Option<&P>) -> Result<bool, glib::Error> {
         unsafe {
             let mut out_have_object = mem::MaybeUninit::uninit();
             let mut error = ptr::null_mut();
-            let _ = ostree_sys::ostree_repo_has_object(self.to_glib_none().0, objtype.to_glib(), checksum.to_glib_none().0, out_have_object.as_mut_ptr(), cancellable.map(|p| p.as_ref()).to_glib_none().0, &mut error);
+            let _ = ffi::ostree_repo_has_object(self.to_glib_none().0, objtype.into_glib(), checksum.to_glib_none().0, out_have_object.as_mut_ptr(), cancellable.map(|p| p.as_ref()).to_glib_none().0, &mut error);
             let out_have_object = out_have_object.assume_init();
             if error.is_null() { Ok(from_glib(out_have_object)) } else { Err(from_glib_full(error)) }
         }
     }
 
     #[cfg(any(feature = "v2017_12", feature = "dox"))]
+    #[cfg_attr(feature = "dox", doc(cfg(feature = "v2017_12")))]
+    #[doc(alias = "ostree_repo_hash")]
     pub fn hash(&self) -> u32 {
         unsafe {
-            ostree_sys::ostree_repo_hash(self.to_glib_none().0)
+            ffi::ostree_repo_hash(self.to_glib_none().0)
         }
     }
 
-    //pub fn import_archive_to_mtree<P: IsA<MutableTree>, Q: IsA<gio::Cancellable>>(&self, opts: /*Ignored*/&mut RepoImportArchiveOptions, archive: /*Unimplemented*/Option<Fundamental: Pointer>, mtree: &P, modifier: Option<&RepoCommitModifier>, cancellable: Option<&Q>) -> Result<(), glib::Error> {
-    //    unsafe { TODO: call ostree_sys:ostree_repo_import_archive_to_mtree() }
+    //#[doc(alias = "ostree_repo_import_archive_to_mtree")]
+    //pub fn import_archive_to_mtree<P: IsA<gio::Cancellable>>(&self, opts: /*Ignored*/&mut RepoImportArchiveOptions, archive: /*Unimplemented*/Option<Fundamental: Pointer>, mtree: &MutableTree, modifier: Option<&RepoCommitModifier>, cancellable: Option<&P>) -> Result<(), glib::Error> {
+    //    unsafe { TODO: call ffi:ostree_repo_import_archive_to_mtree() }
     //}
 
+    #[doc(alias = "ostree_repo_import_object_from")]
     pub fn import_object_from<P: IsA<gio::Cancellable>>(&self, source: &Repo, objtype: ObjectType, checksum: &str, cancellable: Option<&P>) -> Result<(), glib::Error> {
         unsafe {
             let mut error = ptr::null_mut();
-            let _ = ostree_sys::ostree_repo_import_object_from(self.to_glib_none().0, source.to_glib_none().0, objtype.to_glib(), checksum.to_glib_none().0, cancellable.map(|p| p.as_ref()).to_glib_none().0, &mut error);
+            let _ = ffi::ostree_repo_import_object_from(self.to_glib_none().0, source.to_glib_none().0, objtype.into_glib(), checksum.to_glib_none().0, cancellable.map(|p| p.as_ref()).to_glib_none().0, &mut error);
             if error.is_null() { Ok(()) } else { Err(from_glib_full(error)) }
         }
     }
 
     #[cfg(any(feature = "v2016_5", feature = "dox"))]
+    #[cfg_attr(feature = "dox", doc(cfg(feature = "v2016_5")))]
+    #[doc(alias = "ostree_repo_import_object_from_with_trust")]
     pub fn import_object_from_with_trust<P: IsA<gio::Cancellable>>(&self, source: &Repo, objtype: ObjectType, checksum: &str, trusted: bool, cancellable: Option<&P>) -> Result<(), glib::Error> {
         unsafe {
             let mut error = ptr::null_mut();
-            let _ = ostree_sys::ostree_repo_import_object_from_with_trust(self.to_glib_none().0, source.to_glib_none().0, objtype.to_glib(), checksum.to_glib_none().0, trusted.to_glib(), cancellable.map(|p| p.as_ref()).to_glib_none().0, &mut error);
+            let _ = ffi::ostree_repo_import_object_from_with_trust(self.to_glib_none().0, source.to_glib_none().0, objtype.into_glib(), checksum.to_glib_none().0, trusted.into_glib(), cancellable.map(|p| p.as_ref()).to_glib_none().0, &mut error);
             if error.is_null() { Ok(()) } else { Err(from_glib_full(error)) }
         }
     }
 
+    #[doc(alias = "ostree_repo_is_system")]
     pub fn is_system(&self) -> bool {
         unsafe {
-            from_glib(ostree_sys::ostree_repo_is_system(self.to_glib_none().0))
+            from_glib(ffi::ostree_repo_is_system(self.to_glib_none().0))
         }
     }
 
+    #[doc(alias = "ostree_repo_is_writable")]
     pub fn is_writable(&self) -> Result<(), glib::Error> {
         unsafe {
             let mut error = ptr::null_mut();
-            let _ = ostree_sys::ostree_repo_is_writable(self.to_glib_none().0, &mut error);
+            let _ = ffi::ostree_repo_is_writable(self.to_glib_none().0, &mut error);
             if error.is_null() { Ok(()) } else { Err(from_glib_full(error)) }
         }
     }
 
     //#[cfg(any(feature = "v2018_6", feature = "dox"))]
+    //#[cfg_attr(feature = "dox", doc(cfg(feature = "v2018_6")))]
+    //#[doc(alias = "ostree_repo_list_collection_refs")]
     //pub fn list_collection_refs<P: IsA<gio::Cancellable>>(&self, match_collection_id: Option<&str>, out_all_refs: /*Unknown conversion*//*Unimplemented*/HashTable TypeId { ns_id: 1, id: 0 }/TypeId { ns_id: 0, id: 28 }, flags: RepoListRefsExtFlags, cancellable: Option<&P>) -> Result<(), glib::Error> {
-    //    unsafe { TODO: call ostree_sys:ostree_repo_list_collection_refs() }
+    //    unsafe { TODO: call ffi:ostree_repo_list_collection_refs() }
     //}
 
+    //#[doc(alias = "ostree_repo_list_commit_objects_starting_with")]
     //pub fn list_commit_objects_starting_with<P: IsA<gio::Cancellable>>(&self, start: &str, out_commits: /*Unknown conversion*//*Unimplemented*/HashTable TypeId { ns_id: 2, id: 194 }/TypeId { ns_id: 2, id: 194 }, cancellable: Option<&P>) -> Result<(), glib::Error> {
-    //    unsafe { TODO: call ostree_sys:ostree_repo_list_commit_objects_starting_with() }
+    //    unsafe { TODO: call ffi:ostree_repo_list_commit_objects_starting_with() }
     //}
 
+    //#[doc(alias = "ostree_repo_list_objects")]
     //pub fn list_objects<P: IsA<gio::Cancellable>>(&self, flags: RepoListObjectsFlags, out_objects: /*Unknown conversion*//*Unimplemented*/HashTable TypeId { ns_id: 2, id: 194 }/TypeId { ns_id: 2, id: 194 }, cancellable: Option<&P>) -> Result<(), glib::Error> {
-    //    unsafe { TODO: call ostree_sys:ostree_repo_list_objects() }
+    //    unsafe { TODO: call ffi:ostree_repo_list_objects() }
     //}
 
+    //#[doc(alias = "ostree_repo_list_refs")]
     //pub fn list_refs<P: IsA<gio::Cancellable>>(&self, refspec_prefix: Option<&str>, out_all_refs: /*Unknown conversion*//*Unimplemented*/HashTable TypeId { ns_id: 0, id: 28 }/TypeId { ns_id: 0, id: 28 }, cancellable: Option<&P>) -> Result<(), glib::Error> {
-    //    unsafe { TODO: call ostree_sys:ostree_repo_list_refs() }
+    //    unsafe { TODO: call ffi:ostree_repo_list_refs() }
     //}
 
     //#[cfg(any(feature = "v2016_4", feature = "dox"))]
+    //#[cfg_attr(feature = "dox", doc(cfg(feature = "v2016_4")))]
+    //#[doc(alias = "ostree_repo_list_refs_ext")]
     //pub fn list_refs_ext<P: IsA<gio::Cancellable>>(&self, refspec_prefix: Option<&str>, out_all_refs: /*Unknown conversion*//*Unimplemented*/HashTable TypeId { ns_id: 0, id: 28 }/TypeId { ns_id: 0, id: 28 }, flags: RepoListRefsExtFlags, cancellable: Option<&P>) -> Result<(), glib::Error> {
-    //    unsafe { TODO: call ostree_sys:ostree_repo_list_refs_ext() }
+    //    unsafe { TODO: call ffi:ostree_repo_list_refs_ext() }
     //}
 
     #[cfg(any(feature = "v2020_8", feature = "dox"))]
-    pub fn list_static_delta_indexes<P: IsA<gio::Cancellable>>(&self, cancellable: Option<&P>) -> Result<Vec<GString>, glib::Error> {
+    #[cfg_attr(feature = "dox", doc(cfg(feature = "v2020_8")))]
+    #[doc(alias = "ostree_repo_list_static_delta_indexes")]
+    pub fn list_static_delta_indexes<P: IsA<gio::Cancellable>>(&self, cancellable: Option<&P>) -> Result<Vec<glib::GString>, glib::Error> {
         unsafe {
             let mut out_indexes = ptr::null_mut();
             let mut error = ptr::null_mut();
-            let _ = ostree_sys::ostree_repo_list_static_delta_indexes(self.to_glib_none().0, &mut out_indexes, cancellable.map(|p| p.as_ref()).to_glib_none().0, &mut error);
+            let _ = ffi::ostree_repo_list_static_delta_indexes(self.to_glib_none().0, &mut out_indexes, cancellable.map(|p| p.as_ref()).to_glib_none().0, &mut error);
             if error.is_null() { Ok(FromGlibPtrContainer::from_glib_container(out_indexes)) } else { Err(from_glib_full(error)) }
         }
     }
 
-    pub fn list_static_delta_names<P: IsA<gio::Cancellable>>(&self, cancellable: Option<&P>) -> Result<Vec<GString>, glib::Error> {
+    #[doc(alias = "ostree_repo_list_static_delta_names")]
+    pub fn list_static_delta_names<P: IsA<gio::Cancellable>>(&self, cancellable: Option<&P>) -> Result<Vec<glib::GString>, glib::Error> {
         unsafe {
             let mut out_deltas = ptr::null_mut();
             let mut error = ptr::null_mut();
-            let _ = ostree_sys::ostree_repo_list_static_delta_names(self.to_glib_none().0, &mut out_deltas, cancellable.map(|p| p.as_ref()).to_glib_none().0, &mut error);
+            let _ = ffi::ostree_repo_list_static_delta_names(self.to_glib_none().0, &mut out_deltas, cancellable.map(|p| p.as_ref()).to_glib_none().0, &mut error);
             if error.is_null() { Ok(FromGlibPtrContainer::from_glib_container(out_deltas)) } else { Err(from_glib_full(error)) }
         }
     }
 
     #[cfg(any(feature = "v2015_7", feature = "dox"))]
+    #[cfg_attr(feature = "dox", doc(cfg(feature = "v2015_7")))]
+    #[doc(alias = "ostree_repo_load_commit")]
     pub fn load_commit(&self, checksum: &str) -> Result<(glib::Variant, RepoCommitState), glib::Error> {
         unsafe {
             let mut out_commit = ptr::null_mut();
             let mut out_state = mem::MaybeUninit::uninit();
             let mut error = ptr::null_mut();
-            let _ = ostree_sys::ostree_repo_load_commit(self.to_glib_none().0, checksum.to_glib_none().0, &mut out_commit, out_state.as_mut_ptr(), &mut error);
+            let _ = ffi::ostree_repo_load_commit(self.to_glib_none().0, checksum.to_glib_none().0, &mut out_commit, out_state.as_mut_ptr(), &mut error);
             let out_state = out_state.assume_init();
             if error.is_null() { Ok((from_glib_full(out_commit), from_glib(out_state))) } else { Err(from_glib_full(error)) }
         }
     }
 
+    #[doc(alias = "ostree_repo_load_file")]
     pub fn load_file<P: IsA<gio::Cancellable>>(&self, checksum: &str, cancellable: Option<&P>) -> Result<(Option<gio::InputStream>, Option<gio::FileInfo>, Option<glib::Variant>), glib::Error> {
         unsafe {
             let mut out_input = ptr::null_mut();
             let mut out_file_info = ptr::null_mut();
             let mut out_xattrs = ptr::null_mut();
             let mut error = ptr::null_mut();
-            let _ = ostree_sys::ostree_repo_load_file(self.to_glib_none().0, checksum.to_glib_none().0, &mut out_input, &mut out_file_info, &mut out_xattrs, cancellable.map(|p| p.as_ref()).to_glib_none().0, &mut error);
+            let _ = ffi::ostree_repo_load_file(self.to_glib_none().0, checksum.to_glib_none().0, &mut out_input, &mut out_file_info, &mut out_xattrs, cancellable.map(|p| p.as_ref()).to_glib_none().0, &mut error);
             if error.is_null() { Ok((from_glib_full(out_input), from_glib_full(out_file_info), from_glib_full(out_xattrs))) } else { Err(from_glib_full(error)) }
         }
     }
 
+    #[doc(alias = "ostree_repo_load_object_stream")]
     pub fn load_object_stream<P: IsA<gio::Cancellable>>(&self, objtype: ObjectType, checksum: &str, cancellable: Option<&P>) -> Result<(gio::InputStream, u64), glib::Error> {
         unsafe {
             let mut out_input = ptr::null_mut();
             let mut out_size = mem::MaybeUninit::uninit();
             let mut error = ptr::null_mut();
-            let _ = ostree_sys::ostree_repo_load_object_stream(self.to_glib_none().0, objtype.to_glib(), checksum.to_glib_none().0, &mut out_input, out_size.as_mut_ptr(), cancellable.map(|p| p.as_ref()).to_glib_none().0, &mut error);
+            let _ = ffi::ostree_repo_load_object_stream(self.to_glib_none().0, objtype.into_glib(), checksum.to_glib_none().0, &mut out_input, out_size.as_mut_ptr(), cancellable.map(|p| p.as_ref()).to_glib_none().0, &mut error);
             let out_size = out_size.assume_init();
             if error.is_null() { Ok((from_glib_full(out_input), out_size)) } else { Err(from_glib_full(error)) }
         }
     }
 
+    #[doc(alias = "ostree_repo_load_variant")]
     pub fn load_variant(&self, objtype: ObjectType, sha256: &str) -> Result<glib::Variant, glib::Error> {
         unsafe {
             let mut out_variant = ptr::null_mut();
             let mut error = ptr::null_mut();
-            let _ = ostree_sys::ostree_repo_load_variant(self.to_glib_none().0, objtype.to_glib(), sha256.to_glib_none().0, &mut out_variant, &mut error);
+            let _ = ffi::ostree_repo_load_variant(self.to_glib_none().0, objtype.into_glib(), sha256.to_glib_none().0, &mut out_variant, &mut error);
             if error.is_null() { Ok(from_glib_full(out_variant)) } else { Err(from_glib_full(error)) }
         }
     }
 
+    #[doc(alias = "ostree_repo_load_variant_if_exists")]
     pub fn load_variant_if_exists(&self, objtype: ObjectType, sha256: &str) -> Result<Option<glib::Variant>, glib::Error> {
         unsafe {
             let mut out_variant = ptr::null_mut();
             let mut error = ptr::null_mut();
-            let _ = ostree_sys::ostree_repo_load_variant_if_exists(self.to_glib_none().0, objtype.to_glib(), sha256.to_glib_none().0, &mut out_variant, &mut error);
+            let _ = ffi::ostree_repo_load_variant_if_exists(self.to_glib_none().0, objtype.into_glib(), sha256.to_glib_none().0, &mut out_variant, &mut error);
             if error.is_null() { Ok(from_glib_full(out_variant)) } else { Err(from_glib_full(error)) }
         }
     }
 
     #[cfg(any(feature = "v2017_15", feature = "dox"))]
+    #[cfg_attr(feature = "dox", doc(cfg(feature = "v2017_15")))]
+    #[doc(alias = "ostree_repo_mark_commit_partial")]
     pub fn mark_commit_partial(&self, checksum: &str, is_partial: bool) -> Result<(), glib::Error> {
         unsafe {
             let mut error = ptr::null_mut();
-            let _ = ostree_sys::ostree_repo_mark_commit_partial(self.to_glib_none().0, checksum.to_glib_none().0, is_partial.to_glib(), &mut error);
+            let _ = ffi::ostree_repo_mark_commit_partial(self.to_glib_none().0, checksum.to_glib_none().0, is_partial.into_glib(), &mut error);
             if error.is_null() { Ok(()) } else { Err(from_glib_full(error)) }
         }
     }
 
     #[cfg(any(feature = "v2019_4", feature = "dox"))]
+    #[cfg_attr(feature = "dox", doc(cfg(feature = "v2019_4")))]
+    #[doc(alias = "ostree_repo_mark_commit_partial_reason")]
     pub fn mark_commit_partial_reason(&self, checksum: &str, is_partial: bool, in_state: RepoCommitState) -> Result<(), glib::Error> {
         unsafe {
             let mut error = ptr::null_mut();
-            let _ = ostree_sys::ostree_repo_mark_commit_partial_reason(self.to_glib_none().0, checksum.to_glib_none().0, is_partial.to_glib(), in_state.to_glib(), &mut error);
+            let _ = ffi::ostree_repo_mark_commit_partial_reason(self.to_glib_none().0, checksum.to_glib_none().0, is_partial.into_glib(), in_state.into_glib(), &mut error);
             if error.is_null() { Ok(()) } else { Err(from_glib_full(error)) }
         }
     }
 
+    #[doc(alias = "ostree_repo_open")]
     pub fn open<P: IsA<gio::Cancellable>>(&self, cancellable: Option<&P>) -> Result<(), glib::Error> {
         unsafe {
             let mut error = ptr::null_mut();
-            let _ = ostree_sys::ostree_repo_open(self.to_glib_none().0, cancellable.map(|p| p.as_ref()).to_glib_none().0, &mut error);
+            let _ = ffi::ostree_repo_open(self.to_glib_none().0, cancellable.map(|p| p.as_ref()).to_glib_none().0, &mut error);
             if error.is_null() { Ok(()) } else { Err(from_glib_full(error)) }
         }
     }
 
+    #[doc(alias = "ostree_repo_prepare_transaction")]
     pub fn prepare_transaction<P: IsA<gio::Cancellable>>(&self, cancellable: Option<&P>) -> Result<bool, glib::Error> {
         unsafe {
             let mut out_transaction_resume = mem::MaybeUninit::uninit();
             let mut error = ptr::null_mut();
-            let _ = ostree_sys::ostree_repo_prepare_transaction(self.to_glib_none().0, out_transaction_resume.as_mut_ptr(), cancellable.map(|p| p.as_ref()).to_glib_none().0, &mut error);
+            let _ = ffi::ostree_repo_prepare_transaction(self.to_glib_none().0, out_transaction_resume.as_mut_ptr(), cancellable.map(|p| p.as_ref()).to_glib_none().0, &mut error);
             let out_transaction_resume = out_transaction_resume.assume_init();
             if error.is_null() { Ok(from_glib(out_transaction_resume)) } else { Err(from_glib_full(error)) }
         }
     }
 
+    #[doc(alias = "ostree_repo_prune")]
     pub fn prune<P: IsA<gio::Cancellable>>(&self, flags: RepoPruneFlags, depth: i32, cancellable: Option<&P>) -> Result<(i32, i32, u64), glib::Error> {
         unsafe {
             let mut out_objects_total = mem::MaybeUninit::uninit();
             let mut out_objects_pruned = mem::MaybeUninit::uninit();
             let mut out_pruned_object_size_total = mem::MaybeUninit::uninit();
             let mut error = ptr::null_mut();
-            let _ = ostree_sys::ostree_repo_prune(self.to_glib_none().0, flags.to_glib(), depth, out_objects_total.as_mut_ptr(), out_objects_pruned.as_mut_ptr(), out_pruned_object_size_total.as_mut_ptr(), cancellable.map(|p| p.as_ref()).to_glib_none().0, &mut error);
+            let _ = ffi::ostree_repo_prune(self.to_glib_none().0, flags.into_glib(), depth, out_objects_total.as_mut_ptr(), out_objects_pruned.as_mut_ptr(), out_pruned_object_size_total.as_mut_ptr(), cancellable.map(|p| p.as_ref()).to_glib_none().0, &mut error);
             let out_objects_total = out_objects_total.assume_init();
             let out_objects_pruned = out_objects_pruned.assume_init();
             let out_pruned_object_size_total = out_pruned_object_size_total.assume_init();
@@ -496,604 +585,705 @@ impl Repo {
     }
 
     //#[cfg(any(feature = "v2017_1", feature = "dox"))]
+    //#[cfg_attr(feature = "dox", doc(cfg(feature = "v2017_1")))]
+    //#[doc(alias = "ostree_repo_prune_from_reachable")]
     //pub fn prune_from_reachable<P: IsA<gio::Cancellable>>(&self, options: /*Ignored*/&mut RepoPruneOptions, cancellable: Option<&P>) -> Result<(i32, i32, u64), glib::Error> {
-    //    unsafe { TODO: call ostree_sys:ostree_repo_prune_from_reachable() }
+    //    unsafe { TODO: call ffi:ostree_repo_prune_from_reachable() }
     //}
 
+    #[doc(alias = "ostree_repo_prune_static_deltas")]
     pub fn prune_static_deltas<P: IsA<gio::Cancellable>>(&self, commit: Option<&str>, cancellable: Option<&P>) -> Result<(), glib::Error> {
         unsafe {
             let mut error = ptr::null_mut();
-            let _ = ostree_sys::ostree_repo_prune_static_deltas(self.to_glib_none().0, commit.to_glib_none().0, cancellable.map(|p| p.as_ref()).to_glib_none().0, &mut error);
+            let _ = ffi::ostree_repo_prune_static_deltas(self.to_glib_none().0, commit.to_glib_none().0, cancellable.map(|p| p.as_ref()).to_glib_none().0, &mut error);
             if error.is_null() { Ok(()) } else { Err(from_glib_full(error)) }
         }
     }
 
-    pub fn pull<P: IsA<AsyncProgress>, Q: IsA<gio::Cancellable>>(&self, remote_name: &str, refs_to_fetch: &[&str], flags: RepoPullFlags, progress: Option<&P>, cancellable: Option<&Q>) -> Result<(), glib::Error> {
+    #[doc(alias = "ostree_repo_pull")]
+    pub fn pull<P: IsA<gio::Cancellable>>(&self, remote_name: &str, refs_to_fetch: &[&str], flags: RepoPullFlags, progress: Option<&AsyncProgress>, cancellable: Option<&P>) -> Result<(), glib::Error> {
         unsafe {
             let mut error = ptr::null_mut();
-            let _ = ostree_sys::ostree_repo_pull(self.to_glib_none().0, remote_name.to_glib_none().0, refs_to_fetch.to_glib_none().0, flags.to_glib(), progress.map(|p| p.as_ref()).to_glib_none().0, cancellable.map(|p| p.as_ref()).to_glib_none().0, &mut error);
+            let _ = ffi::ostree_repo_pull(self.to_glib_none().0, remote_name.to_glib_none().0, refs_to_fetch.to_glib_none().0, flags.into_glib(), progress.to_glib_none().0, cancellable.map(|p| p.as_ref()).to_glib_none().0, &mut error);
             if error.is_null() { Ok(()) } else { Err(from_glib_full(error)) }
         }
     }
 
-    pub fn pull_one_dir<P: IsA<AsyncProgress>, Q: IsA<gio::Cancellable>>(&self, remote_name: &str, dir_to_pull: &str, refs_to_fetch: &[&str], flags: RepoPullFlags, progress: Option<&P>, cancellable: Option<&Q>) -> Result<(), glib::Error> {
+    #[doc(alias = "ostree_repo_pull_one_dir")]
+    pub fn pull_one_dir<P: IsA<gio::Cancellable>>(&self, remote_name: &str, dir_to_pull: &str, refs_to_fetch: &[&str], flags: RepoPullFlags, progress: Option<&AsyncProgress>, cancellable: Option<&P>) -> Result<(), glib::Error> {
         unsafe {
             let mut error = ptr::null_mut();
-            let _ = ostree_sys::ostree_repo_pull_one_dir(self.to_glib_none().0, remote_name.to_glib_none().0, dir_to_pull.to_glib_none().0, refs_to_fetch.to_glib_none().0, flags.to_glib(), progress.map(|p| p.as_ref()).to_glib_none().0, cancellable.map(|p| p.as_ref()).to_glib_none().0, &mut error);
+            let _ = ffi::ostree_repo_pull_one_dir(self.to_glib_none().0, remote_name.to_glib_none().0, dir_to_pull.to_glib_none().0, refs_to_fetch.to_glib_none().0, flags.into_glib(), progress.to_glib_none().0, cancellable.map(|p| p.as_ref()).to_glib_none().0, &mut error);
             if error.is_null() { Ok(()) } else { Err(from_glib_full(error)) }
         }
     }
 
-    pub fn pull_with_options<P: IsA<AsyncProgress>, Q: IsA<gio::Cancellable>>(&self, remote_name_or_baseurl: &str, options: &glib::Variant, progress: Option<&P>, cancellable: Option<&Q>) -> Result<(), glib::Error> {
+    #[doc(alias = "ostree_repo_pull_with_options")]
+    pub fn pull_with_options<P: IsA<gio::Cancellable>>(&self, remote_name_or_baseurl: &str, options: &glib::Variant, progress: Option<&AsyncProgress>, cancellable: Option<&P>) -> Result<(), glib::Error> {
         unsafe {
             let mut error = ptr::null_mut();
-            let _ = ostree_sys::ostree_repo_pull_with_options(self.to_glib_none().0, remote_name_or_baseurl.to_glib_none().0, options.to_glib_none().0, progress.map(|p| p.as_ref()).to_glib_none().0, cancellable.map(|p| p.as_ref()).to_glib_none().0, &mut error);
+            let _ = ffi::ostree_repo_pull_with_options(self.to_glib_none().0, remote_name_or_baseurl.to_glib_none().0, options.to_glib_none().0, progress.to_glib_none().0, cancellable.map(|p| p.as_ref()).to_glib_none().0, &mut error);
             if error.is_null() { Ok(()) } else { Err(from_glib_full(error)) }
         }
     }
 
+    #[doc(alias = "ostree_repo_query_object_storage_size")]
     pub fn query_object_storage_size<P: IsA<gio::Cancellable>>(&self, objtype: ObjectType, sha256: &str, cancellable: Option<&P>) -> Result<u64, glib::Error> {
         unsafe {
             let mut out_size = mem::MaybeUninit::uninit();
             let mut error = ptr::null_mut();
-            let _ = ostree_sys::ostree_repo_query_object_storage_size(self.to_glib_none().0, objtype.to_glib(), sha256.to_glib_none().0, out_size.as_mut_ptr(), cancellable.map(|p| p.as_ref()).to_glib_none().0, &mut error);
+            let _ = ffi::ostree_repo_query_object_storage_size(self.to_glib_none().0, objtype.into_glib(), sha256.to_glib_none().0, out_size.as_mut_ptr(), cancellable.map(|p| p.as_ref()).to_glib_none().0, &mut error);
             let out_size = out_size.assume_init();
             if error.is_null() { Ok(out_size) } else { Err(from_glib_full(error)) }
         }
     }
 
-    pub fn read_commit<P: IsA<gio::Cancellable>>(&self, ref_: &str, cancellable: Option<&P>) -> Result<(gio::File, GString), glib::Error> {
+    #[doc(alias = "ostree_repo_read_commit")]
+    pub fn read_commit<P: IsA<gio::Cancellable>>(&self, ref_: &str, cancellable: Option<&P>) -> Result<(gio::File, glib::GString), glib::Error> {
         unsafe {
             let mut out_root = ptr::null_mut();
             let mut out_commit = ptr::null_mut();
             let mut error = ptr::null_mut();
-            let _ = ostree_sys::ostree_repo_read_commit(self.to_glib_none().0, ref_.to_glib_none().0, &mut out_root, &mut out_commit, cancellable.map(|p| p.as_ref()).to_glib_none().0, &mut error);
+            let _ = ffi::ostree_repo_read_commit(self.to_glib_none().0, ref_.to_glib_none().0, &mut out_root, &mut out_commit, cancellable.map(|p| p.as_ref()).to_glib_none().0, &mut error);
             if error.is_null() { Ok((from_glib_full(out_root), from_glib_full(out_commit))) } else { Err(from_glib_full(error)) }
         }
     }
 
+    #[doc(alias = "ostree_repo_read_commit_detached_metadata")]
     pub fn read_commit_detached_metadata<P: IsA<gio::Cancellable>>(&self, checksum: &str, cancellable: Option<&P>) -> Result<glib::Variant, glib::Error> {
         unsafe {
             let mut out_metadata = ptr::null_mut();
             let mut error = ptr::null_mut();
-            let _ = ostree_sys::ostree_repo_read_commit_detached_metadata(self.to_glib_none().0, checksum.to_glib_none().0, &mut out_metadata, cancellable.map(|p| p.as_ref()).to_glib_none().0, &mut error);
+            let _ = ffi::ostree_repo_read_commit_detached_metadata(self.to_glib_none().0, checksum.to_glib_none().0, &mut out_metadata, cancellable.map(|p| p.as_ref()).to_glib_none().0, &mut error);
             if error.is_null() { Ok(from_glib_full(out_metadata)) } else { Err(from_glib_full(error)) }
         }
     }
 
+    #[doc(alias = "ostree_repo_regenerate_summary")]
     pub fn regenerate_summary<P: IsA<gio::Cancellable>>(&self, additional_metadata: Option<&glib::Variant>, cancellable: Option<&P>) -> Result<(), glib::Error> {
         unsafe {
             let mut error = ptr::null_mut();
-            let _ = ostree_sys::ostree_repo_regenerate_summary(self.to_glib_none().0, additional_metadata.to_glib_none().0, cancellable.map(|p| p.as_ref()).to_glib_none().0, &mut error);
+            let _ = ffi::ostree_repo_regenerate_summary(self.to_glib_none().0, additional_metadata.to_glib_none().0, cancellable.map(|p| p.as_ref()).to_glib_none().0, &mut error);
             if error.is_null() { Ok(()) } else { Err(from_glib_full(error)) }
         }
     }
 
     #[cfg(any(feature = "v2017_2", feature = "dox"))]
+    #[cfg_attr(feature = "dox", doc(cfg(feature = "v2017_2")))]
+    #[doc(alias = "ostree_repo_reload_config")]
     pub fn reload_config<P: IsA<gio::Cancellable>>(&self, cancellable: Option<&P>) -> Result<(), glib::Error> {
         unsafe {
             let mut error = ptr::null_mut();
-            let _ = ostree_sys::ostree_repo_reload_config(self.to_glib_none().0, cancellable.map(|p| p.as_ref()).to_glib_none().0, &mut error);
+            let _ = ffi::ostree_repo_reload_config(self.to_glib_none().0, cancellable.map(|p| p.as_ref()).to_glib_none().0, &mut error);
             if error.is_null() { Ok(()) } else { Err(from_glib_full(error)) }
         }
     }
 
+    #[doc(alias = "ostree_repo_remote_add")]
     pub fn remote_add<P: IsA<gio::Cancellable>>(&self, name: &str, url: &str, options: Option<&glib::Variant>, cancellable: Option<&P>) -> Result<(), glib::Error> {
         unsafe {
             let mut error = ptr::null_mut();
-            let _ = ostree_sys::ostree_repo_remote_add(self.to_glib_none().0, name.to_glib_none().0, url.to_glib_none().0, options.to_glib_none().0, cancellable.map(|p| p.as_ref()).to_glib_none().0, &mut error);
+            let _ = ffi::ostree_repo_remote_add(self.to_glib_none().0, name.to_glib_none().0, url.to_glib_none().0, options.to_glib_none().0, cancellable.map(|p| p.as_ref()).to_glib_none().0, &mut error);
             if error.is_null() { Ok(()) } else { Err(from_glib_full(error)) }
         }
     }
 
+    #[doc(alias = "ostree_repo_remote_change")]
     pub fn remote_change<P: IsA<gio::File>, Q: IsA<gio::Cancellable>>(&self, sysroot: Option<&P>, changeop: RepoRemoteChange, name: &str, url: &str, options: Option<&glib::Variant>, cancellable: Option<&Q>) -> Result<(), glib::Error> {
         unsafe {
             let mut error = ptr::null_mut();
-            let _ = ostree_sys::ostree_repo_remote_change(self.to_glib_none().0, sysroot.map(|p| p.as_ref()).to_glib_none().0, changeop.to_glib(), name.to_glib_none().0, url.to_glib_none().0, options.to_glib_none().0, cancellable.map(|p| p.as_ref()).to_glib_none().0, &mut error);
+            let _ = ffi::ostree_repo_remote_change(self.to_glib_none().0, sysroot.map(|p| p.as_ref()).to_glib_none().0, changeop.into_glib(), name.to_glib_none().0, url.to_glib_none().0, options.to_glib_none().0, cancellable.map(|p| p.as_ref()).to_glib_none().0, &mut error);
             if error.is_null() { Ok(()) } else { Err(from_glib_full(error)) }
         }
     }
 
+    #[doc(alias = "ostree_repo_remote_delete")]
     pub fn remote_delete<P: IsA<gio::Cancellable>>(&self, name: &str, cancellable: Option<&P>) -> Result<(), glib::Error> {
         unsafe {
             let mut error = ptr::null_mut();
-            let _ = ostree_sys::ostree_repo_remote_delete(self.to_glib_none().0, name.to_glib_none().0, cancellable.map(|p| p.as_ref()).to_glib_none().0, &mut error);
+            let _ = ffi::ostree_repo_remote_delete(self.to_glib_none().0, name.to_glib_none().0, cancellable.map(|p| p.as_ref()).to_glib_none().0, &mut error);
             if error.is_null() { Ok(()) } else { Err(from_glib_full(error)) }
         }
     }
 
+    #[doc(alias = "ostree_repo_remote_fetch_summary")]
     pub fn remote_fetch_summary<P: IsA<gio::Cancellable>>(&self, name: &str, cancellable: Option<&P>) -> Result<(glib::Bytes, glib::Bytes), glib::Error> {
         unsafe {
             let mut out_summary = ptr::null_mut();
             let mut out_signatures = ptr::null_mut();
             let mut error = ptr::null_mut();
-            let _ = ostree_sys::ostree_repo_remote_fetch_summary(self.to_glib_none().0, name.to_glib_none().0, &mut out_summary, &mut out_signatures, cancellable.map(|p| p.as_ref()).to_glib_none().0, &mut error);
+            let _ = ffi::ostree_repo_remote_fetch_summary(self.to_glib_none().0, name.to_glib_none().0, &mut out_summary, &mut out_signatures, cancellable.map(|p| p.as_ref()).to_glib_none().0, &mut error);
             if error.is_null() { Ok((from_glib_full(out_summary), from_glib_full(out_signatures))) } else { Err(from_glib_full(error)) }
         }
     }
 
     #[cfg(any(feature = "v2016_6", feature = "dox"))]
+    #[cfg_attr(feature = "dox", doc(cfg(feature = "v2016_6")))]
+    #[doc(alias = "ostree_repo_remote_fetch_summary_with_options")]
     pub fn remote_fetch_summary_with_options<P: IsA<gio::Cancellable>>(&self, name: &str, options: Option<&glib::Variant>, cancellable: Option<&P>) -> Result<(glib::Bytes, glib::Bytes), glib::Error> {
         unsafe {
             let mut out_summary = ptr::null_mut();
             let mut out_signatures = ptr::null_mut();
             let mut error = ptr::null_mut();
-            let _ = ostree_sys::ostree_repo_remote_fetch_summary_with_options(self.to_glib_none().0, name.to_glib_none().0, options.to_glib_none().0, &mut out_summary, &mut out_signatures, cancellable.map(|p| p.as_ref()).to_glib_none().0, &mut error);
+            let _ = ffi::ostree_repo_remote_fetch_summary_with_options(self.to_glib_none().0, name.to_glib_none().0, options.to_glib_none().0, &mut out_summary, &mut out_signatures, cancellable.map(|p| p.as_ref()).to_glib_none().0, &mut error);
             if error.is_null() { Ok((from_glib_full(out_summary), from_glib_full(out_signatures))) } else { Err(from_glib_full(error)) }
         }
     }
 
+    #[doc(alias = "ostree_repo_remote_get_gpg_verify")]
     pub fn remote_get_gpg_verify(&self, name: &str) -> Result<bool, glib::Error> {
         unsafe {
             let mut out_gpg_verify = mem::MaybeUninit::uninit();
             let mut error = ptr::null_mut();
-            let _ = ostree_sys::ostree_repo_remote_get_gpg_verify(self.to_glib_none().0, name.to_glib_none().0, out_gpg_verify.as_mut_ptr(), &mut error);
+            let _ = ffi::ostree_repo_remote_get_gpg_verify(self.to_glib_none().0, name.to_glib_none().0, out_gpg_verify.as_mut_ptr(), &mut error);
             let out_gpg_verify = out_gpg_verify.assume_init();
             if error.is_null() { Ok(from_glib(out_gpg_verify)) } else { Err(from_glib_full(error)) }
         }
     }
 
+    #[doc(alias = "ostree_repo_remote_get_gpg_verify_summary")]
     pub fn remote_get_gpg_verify_summary(&self, name: &str) -> Result<bool, glib::Error> {
         unsafe {
             let mut out_gpg_verify_summary = mem::MaybeUninit::uninit();
             let mut error = ptr::null_mut();
-            let _ = ostree_sys::ostree_repo_remote_get_gpg_verify_summary(self.to_glib_none().0, name.to_glib_none().0, out_gpg_verify_summary.as_mut_ptr(), &mut error);
+            let _ = ffi::ostree_repo_remote_get_gpg_verify_summary(self.to_glib_none().0, name.to_glib_none().0, out_gpg_verify_summary.as_mut_ptr(), &mut error);
             let out_gpg_verify_summary = out_gpg_verify_summary.assume_init();
             if error.is_null() { Ok(from_glib(out_gpg_verify_summary)) } else { Err(from_glib_full(error)) }
         }
     }
 
-    pub fn remote_get_url(&self, name: &str) -> Result<GString, glib::Error> {
+    #[doc(alias = "ostree_repo_remote_get_url")]
+    pub fn remote_get_url(&self, name: &str) -> Result<glib::GString, glib::Error> {
         unsafe {
             let mut out_url = ptr::null_mut();
             let mut error = ptr::null_mut();
-            let _ = ostree_sys::ostree_repo_remote_get_url(self.to_glib_none().0, name.to_glib_none().0, &mut out_url, &mut error);
+            let _ = ffi::ostree_repo_remote_get_url(self.to_glib_none().0, name.to_glib_none().0, &mut out_url, &mut error);
             if error.is_null() { Ok(from_glib_full(out_url)) } else { Err(from_glib_full(error)) }
         }
     }
 
+    #[doc(alias = "ostree_repo_remote_gpg_import")]
     pub fn remote_gpg_import<P: IsA<gio::InputStream>, Q: IsA<gio::Cancellable>>(&self, name: &str, source_stream: Option<&P>, key_ids: &[&str], cancellable: Option<&Q>) -> Result<u32, glib::Error> {
         unsafe {
             let mut out_imported = mem::MaybeUninit::uninit();
             let mut error = ptr::null_mut();
-            let _ = ostree_sys::ostree_repo_remote_gpg_import(self.to_glib_none().0, name.to_glib_none().0, source_stream.map(|p| p.as_ref()).to_glib_none().0, key_ids.to_glib_none().0, out_imported.as_mut_ptr(), cancellable.map(|p| p.as_ref()).to_glib_none().0, &mut error);
+            let _ = ffi::ostree_repo_remote_gpg_import(self.to_glib_none().0, name.to_glib_none().0, source_stream.map(|p| p.as_ref()).to_glib_none().0, key_ids.to_glib_none().0, out_imported.as_mut_ptr(), cancellable.map(|p| p.as_ref()).to_glib_none().0, &mut error);
             let out_imported = out_imported.assume_init();
             if error.is_null() { Ok(out_imported) } else { Err(from_glib_full(error)) }
         }
     }
 
-    pub fn remote_list(&self) -> Vec<GString> {
+    #[doc(alias = "ostree_repo_remote_list")]
+    pub fn remote_list(&self) -> Vec<glib::GString> {
         unsafe {
             let mut out_n_remotes = mem::MaybeUninit::uninit();
-            let ret = FromGlibContainer::from_glib_full_num(ostree_sys::ostree_repo_remote_list(self.to_glib_none().0, out_n_remotes.as_mut_ptr()), out_n_remotes.assume_init() as usize);
+            let ret = FromGlibContainer::from_glib_full_num(ffi::ostree_repo_remote_list(self.to_glib_none().0, out_n_remotes.as_mut_ptr()), out_n_remotes.assume_init() as usize);
             ret
         }
     }
 
     //#[cfg(any(feature = "v2018_6", feature = "dox"))]
+    //#[cfg_attr(feature = "dox", doc(cfg(feature = "v2018_6")))]
+    //#[doc(alias = "ostree_repo_remote_list_collection_refs")]
     //pub fn remote_list_collection_refs<P: IsA<gio::Cancellable>>(&self, remote_name: &str, out_all_refs: /*Unknown conversion*//*Unimplemented*/HashTable TypeId { ns_id: 1, id: 0 }/TypeId { ns_id: 0, id: 28 }, cancellable: Option<&P>) -> Result<(), glib::Error> {
-    //    unsafe { TODO: call ostree_sys:ostree_repo_remote_list_collection_refs() }
+    //    unsafe { TODO: call ffi:ostree_repo_remote_list_collection_refs() }
     //}
 
+    //#[doc(alias = "ostree_repo_remote_list_refs")]
     //pub fn remote_list_refs<P: IsA<gio::Cancellable>>(&self, remote_name: &str, out_all_refs: /*Unknown conversion*//*Unimplemented*/HashTable TypeId { ns_id: 0, id: 28 }/TypeId { ns_id: 0, id: 28 }, cancellable: Option<&P>) -> Result<(), glib::Error> {
-    //    unsafe { TODO: call ostree_sys:ostree_repo_remote_list_refs() }
+    //    unsafe { TODO: call ffi:ostree_repo_remote_list_refs() }
     //}
 
     #[cfg(any(feature = "v2018_6", feature = "dox"))]
-    pub fn resolve_collection_ref<P: IsA<gio::Cancellable>>(&self, ref_: &CollectionRef, allow_noent: bool, flags: RepoResolveRevExtFlags, cancellable: Option<&P>) -> Result<Option<GString>, glib::Error> {
+    #[cfg_attr(feature = "dox", doc(cfg(feature = "v2018_6")))]
+    #[doc(alias = "ostree_repo_resolve_collection_ref")]
+    pub fn resolve_collection_ref<P: IsA<gio::Cancellable>>(&self, ref_: &CollectionRef, allow_noent: bool, flags: RepoResolveRevExtFlags, cancellable: Option<&P>) -> Result<Option<glib::GString>, glib::Error> {
         unsafe {
             let mut out_rev = ptr::null_mut();
             let mut error = ptr::null_mut();
-            let _ = ostree_sys::ostree_repo_resolve_collection_ref(self.to_glib_none().0, ref_.to_glib_none().0, allow_noent.to_glib(), flags.to_glib(), &mut out_rev, cancellable.map(|p| p.as_ref()).to_glib_none().0, &mut error);
+            let _ = ffi::ostree_repo_resolve_collection_ref(self.to_glib_none().0, ref_.to_glib_none().0, allow_noent.into_glib(), flags.into_glib(), &mut out_rev, cancellable.map(|p| p.as_ref()).to_glib_none().0, &mut error);
             if error.is_null() { Ok(from_glib_full(out_rev)) } else { Err(from_glib_full(error)) }
         }
     }
 
     #[cfg(any(feature = "v2018_6", feature = "dox"))]
+    #[cfg_attr(feature = "dox", doc(cfg(feature = "v2018_6")))]
+    #[doc(alias = "ostree_repo_resolve_keyring_for_collection")]
     pub fn resolve_keyring_for_collection<P: IsA<gio::Cancellable>>(&self, collection_id: &str, cancellable: Option<&P>) -> Result<Remote, glib::Error> {
         unsafe {
             let mut error = ptr::null_mut();
-            let ret = ostree_sys::ostree_repo_resolve_keyring_for_collection(self.to_glib_none().0, collection_id.to_glib_none().0, cancellable.map(|p| p.as_ref()).to_glib_none().0, &mut error);
+            let ret = ffi::ostree_repo_resolve_keyring_for_collection(self.to_glib_none().0, collection_id.to_glib_none().0, cancellable.map(|p| p.as_ref()).to_glib_none().0, &mut error);
             if error.is_null() { Ok(from_glib_full(ret)) } else { Err(from_glib_full(error)) }
         }
     }
 
-    pub fn resolve_rev(&self, refspec: &str, allow_noent: bool) -> Result<Option<GString>, glib::Error> {
+    #[doc(alias = "ostree_repo_resolve_rev")]
+    pub fn resolve_rev(&self, refspec: &str, allow_noent: bool) -> Result<Option<glib::GString>, glib::Error> {
         unsafe {
             let mut out_rev = ptr::null_mut();
             let mut error = ptr::null_mut();
-            let _ = ostree_sys::ostree_repo_resolve_rev(self.to_glib_none().0, refspec.to_glib_none().0, allow_noent.to_glib(), &mut out_rev, &mut error);
+            let _ = ffi::ostree_repo_resolve_rev(self.to_glib_none().0, refspec.to_glib_none().0, allow_noent.into_glib(), &mut out_rev, &mut error);
             if error.is_null() { Ok(from_glib_full(out_rev)) } else { Err(from_glib_full(error)) }
         }
     }
 
     #[cfg(any(feature = "v2016_7", feature = "dox"))]
-    pub fn resolve_rev_ext(&self, refspec: &str, allow_noent: bool, flags: RepoResolveRevExtFlags) -> Result<Option<GString>, glib::Error> {
+    #[cfg_attr(feature = "dox", doc(cfg(feature = "v2016_7")))]
+    #[doc(alias = "ostree_repo_resolve_rev_ext")]
+    pub fn resolve_rev_ext(&self, refspec: &str, allow_noent: bool, flags: RepoResolveRevExtFlags) -> Result<Option<glib::GString>, glib::Error> {
         unsafe {
             let mut out_rev = ptr::null_mut();
             let mut error = ptr::null_mut();
-            let _ = ostree_sys::ostree_repo_resolve_rev_ext(self.to_glib_none().0, refspec.to_glib_none().0, allow_noent.to_glib(), flags.to_glib(), &mut out_rev, &mut error);
+            let _ = ffi::ostree_repo_resolve_rev_ext(self.to_glib_none().0, refspec.to_glib_none().0, allow_noent.into_glib(), flags.into_glib(), &mut out_rev, &mut error);
             if error.is_null() { Ok(from_glib_full(out_rev)) } else { Err(from_glib_full(error)) }
         }
     }
 
+    #[doc(alias = "ostree_repo_scan_hardlinks")]
     pub fn scan_hardlinks<P: IsA<gio::Cancellable>>(&self, cancellable: Option<&P>) -> Result<(), glib::Error> {
         unsafe {
             let mut error = ptr::null_mut();
-            let _ = ostree_sys::ostree_repo_scan_hardlinks(self.to_glib_none().0, cancellable.map(|p| p.as_ref()).to_glib_none().0, &mut error);
+            let _ = ffi::ostree_repo_scan_hardlinks(self.to_glib_none().0, cancellable.map(|p| p.as_ref()).to_glib_none().0, &mut error);
             if error.is_null() { Ok(()) } else { Err(from_glib_full(error)) }
         }
     }
 
     #[cfg(any(feature = "v2017_10", feature = "dox"))]
+    #[cfg_attr(feature = "dox", doc(cfg(feature = "v2017_10")))]
+    #[doc(alias = "ostree_repo_set_alias_ref_immediate")]
     pub fn set_alias_ref_immediate<P: IsA<gio::Cancellable>>(&self, remote: Option<&str>, ref_: &str, target: Option<&str>, cancellable: Option<&P>) -> Result<(), glib::Error> {
         unsafe {
             let mut error = ptr::null_mut();
-            let _ = ostree_sys::ostree_repo_set_alias_ref_immediate(self.to_glib_none().0, remote.to_glib_none().0, ref_.to_glib_none().0, target.to_glib_none().0, cancellable.map(|p| p.as_ref()).to_glib_none().0, &mut error);
+            let _ = ffi::ostree_repo_set_alias_ref_immediate(self.to_glib_none().0, remote.to_glib_none().0, ref_.to_glib_none().0, target.to_glib_none().0, cancellable.map(|p| p.as_ref()).to_glib_none().0, &mut error);
             if error.is_null() { Ok(()) } else { Err(from_glib_full(error)) }
         }
     }
 
     #[cfg(any(feature = "v2016_5", feature = "dox"))]
+    #[cfg_attr(feature = "dox", doc(cfg(feature = "v2016_5")))]
+    #[doc(alias = "ostree_repo_set_cache_dir")]
     pub fn set_cache_dir<P: IsA<gio::Cancellable>>(&self, dfd: i32, path: &str, cancellable: Option<&P>) -> Result<(), glib::Error> {
         unsafe {
             let mut error = ptr::null_mut();
-            let _ = ostree_sys::ostree_repo_set_cache_dir(self.to_glib_none().0, dfd, path.to_glib_none().0, cancellable.map(|p| p.as_ref()).to_glib_none().0, &mut error);
+            let _ = ffi::ostree_repo_set_cache_dir(self.to_glib_none().0, dfd, path.to_glib_none().0, cancellable.map(|p| p.as_ref()).to_glib_none().0, &mut error);
             if error.is_null() { Ok(()) } else { Err(from_glib_full(error)) }
         }
     }
 
     #[cfg(any(feature = "v2018_6", feature = "dox"))]
+    #[cfg_attr(feature = "dox", doc(cfg(feature = "v2018_6")))]
+    #[doc(alias = "ostree_repo_set_collection_id")]
     pub fn set_collection_id(&self, collection_id: Option<&str>) -> Result<(), glib::Error> {
         unsafe {
             let mut error = ptr::null_mut();
-            let _ = ostree_sys::ostree_repo_set_collection_id(self.to_glib_none().0, collection_id.to_glib_none().0, &mut error);
+            let _ = ffi::ostree_repo_set_collection_id(self.to_glib_none().0, collection_id.to_glib_none().0, &mut error);
             if error.is_null() { Ok(()) } else { Err(from_glib_full(error)) }
         }
     }
 
     #[cfg(any(feature = "v2018_6", feature = "dox"))]
+    #[cfg_attr(feature = "dox", doc(cfg(feature = "v2018_6")))]
+    #[doc(alias = "ostree_repo_set_collection_ref_immediate")]
     pub fn set_collection_ref_immediate<P: IsA<gio::Cancellable>>(&self, ref_: &CollectionRef, checksum: Option<&str>, cancellable: Option<&P>) -> Result<(), glib::Error> {
         unsafe {
             let mut error = ptr::null_mut();
-            let _ = ostree_sys::ostree_repo_set_collection_ref_immediate(self.to_glib_none().0, ref_.to_glib_none().0, checksum.to_glib_none().0, cancellable.map(|p| p.as_ref()).to_glib_none().0, &mut error);
+            let _ = ffi::ostree_repo_set_collection_ref_immediate(self.to_glib_none().0, ref_.to_glib_none().0, checksum.to_glib_none().0, cancellable.map(|p| p.as_ref()).to_glib_none().0, &mut error);
             if error.is_null() { Ok(()) } else { Err(from_glib_full(error)) }
         }
     }
 
+    #[doc(alias = "ostree_repo_set_disable_fsync")]
     pub fn set_disable_fsync(&self, disable_fsync: bool) {
         unsafe {
-            ostree_sys::ostree_repo_set_disable_fsync(self.to_glib_none().0, disable_fsync.to_glib());
+            ffi::ostree_repo_set_disable_fsync(self.to_glib_none().0, disable_fsync.into_glib());
         }
     }
 
+    #[doc(alias = "ostree_repo_set_ref_immediate")]
     pub fn set_ref_immediate<P: IsA<gio::Cancellable>>(&self, remote: Option<&str>, ref_: &str, checksum: Option<&str>, cancellable: Option<&P>) -> Result<(), glib::Error> {
         unsafe {
             let mut error = ptr::null_mut();
-            let _ = ostree_sys::ostree_repo_set_ref_immediate(self.to_glib_none().0, remote.to_glib_none().0, ref_.to_glib_none().0, checksum.to_glib_none().0, cancellable.map(|p| p.as_ref()).to_glib_none().0, &mut error);
+            let _ = ffi::ostree_repo_set_ref_immediate(self.to_glib_none().0, remote.to_glib_none().0, ref_.to_glib_none().0, checksum.to_glib_none().0, cancellable.map(|p| p.as_ref()).to_glib_none().0, &mut error);
             if error.is_null() { Ok(()) } else { Err(from_glib_full(error)) }
         }
     }
 
+    #[doc(alias = "ostree_repo_sign_commit")]
     pub fn sign_commit<P: IsA<gio::Cancellable>>(&self, commit_checksum: &str, key_id: &str, homedir: Option<&str>, cancellable: Option<&P>) -> Result<(), glib::Error> {
         unsafe {
             let mut error = ptr::null_mut();
-            let _ = ostree_sys::ostree_repo_sign_commit(self.to_glib_none().0, commit_checksum.to_glib_none().0, key_id.to_glib_none().0, homedir.to_glib_none().0, cancellable.map(|p| p.as_ref()).to_glib_none().0, &mut error);
+            let _ = ffi::ostree_repo_sign_commit(self.to_glib_none().0, commit_checksum.to_glib_none().0, key_id.to_glib_none().0, homedir.to_glib_none().0, cancellable.map(|p| p.as_ref()).to_glib_none().0, &mut error);
             if error.is_null() { Ok(()) } else { Err(from_glib_full(error)) }
         }
     }
 
+    #[doc(alias = "ostree_repo_sign_delta")]
     pub fn sign_delta<P: IsA<gio::Cancellable>>(&self, from_commit: &str, to_commit: &str, key_id: &str, homedir: &str, cancellable: Option<&P>) -> Result<(), glib::Error> {
         unsafe {
             let mut error = ptr::null_mut();
-            let _ = ostree_sys::ostree_repo_sign_delta(self.to_glib_none().0, from_commit.to_glib_none().0, to_commit.to_glib_none().0, key_id.to_glib_none().0, homedir.to_glib_none().0, cancellable.map(|p| p.as_ref()).to_glib_none().0, &mut error);
+            let _ = ffi::ostree_repo_sign_delta(self.to_glib_none().0, from_commit.to_glib_none().0, to_commit.to_glib_none().0, key_id.to_glib_none().0, homedir.to_glib_none().0, cancellable.map(|p| p.as_ref()).to_glib_none().0, &mut error);
             if error.is_null() { Ok(()) } else { Err(from_glib_full(error)) }
         }
     }
 
+    #[doc(alias = "ostree_repo_static_delta_execute_offline")]
     pub fn static_delta_execute_offline<P: IsA<gio::File>, Q: IsA<gio::Cancellable>>(&self, dir_or_file: &P, skip_validation: bool, cancellable: Option<&Q>) -> Result<(), glib::Error> {
         unsafe {
             let mut error = ptr::null_mut();
-            let _ = ostree_sys::ostree_repo_static_delta_execute_offline(self.to_glib_none().0, dir_or_file.as_ref().to_glib_none().0, skip_validation.to_glib(), cancellable.map(|p| p.as_ref()).to_glib_none().0, &mut error);
+            let _ = ffi::ostree_repo_static_delta_execute_offline(self.to_glib_none().0, dir_or_file.as_ref().to_glib_none().0, skip_validation.into_glib(), cancellable.map(|p| p.as_ref()).to_glib_none().0, &mut error);
             if error.is_null() { Ok(()) } else { Err(from_glib_full(error)) }
         }
     }
 
     #[cfg(any(feature = "v2020_7", feature = "dox"))]
+    #[cfg_attr(feature = "dox", doc(cfg(feature = "v2020_7")))]
+    #[doc(alias = "ostree_repo_static_delta_execute_offline_with_signature")]
     pub fn static_delta_execute_offline_with_signature<P: IsA<gio::File>, Q: IsA<Sign>, R: IsA<gio::Cancellable>>(&self, dir_or_file: &P, sign: &Q, skip_validation: bool, cancellable: Option<&R>) -> Result<(), glib::Error> {
         unsafe {
             let mut error = ptr::null_mut();
-            let _ = ostree_sys::ostree_repo_static_delta_execute_offline_with_signature(self.to_glib_none().0, dir_or_file.as_ref().to_glib_none().0, sign.as_ref().to_glib_none().0, skip_validation.to_glib(), cancellable.map(|p| p.as_ref()).to_glib_none().0, &mut error);
+            let _ = ffi::ostree_repo_static_delta_execute_offline_with_signature(self.to_glib_none().0, dir_or_file.as_ref().to_glib_none().0, sign.as_ref().to_glib_none().0, skip_validation.into_glib(), cancellable.map(|p| p.as_ref()).to_glib_none().0, &mut error);
             if error.is_null() { Ok(()) } else { Err(from_glib_full(error)) }
         }
     }
 
+    #[doc(alias = "ostree_repo_static_delta_generate")]
     pub fn static_delta_generate<P: IsA<gio::Cancellable>>(&self, opt: StaticDeltaGenerateOpt, from: Option<&str>, to: &str, metadata: Option<&glib::Variant>, params: Option<&glib::Variant>, cancellable: Option<&P>) -> Result<(), glib::Error> {
         unsafe {
             let mut error = ptr::null_mut();
-            let _ = ostree_sys::ostree_repo_static_delta_generate(self.to_glib_none().0, opt.to_glib(), from.to_glib_none().0, to.to_glib_none().0, metadata.to_glib_none().0, params.to_glib_none().0, cancellable.map(|p| p.as_ref()).to_glib_none().0, &mut error);
+            let _ = ffi::ostree_repo_static_delta_generate(self.to_glib_none().0, opt.into_glib(), from.to_glib_none().0, to.to_glib_none().0, metadata.to_glib_none().0, params.to_glib_none().0, cancellable.map(|p| p.as_ref()).to_glib_none().0, &mut error);
             if error.is_null() { Ok(()) } else { Err(from_glib_full(error)) }
         }
     }
 
     //#[cfg(any(feature = "v2020_8", feature = "dox"))]
+    //#[cfg_attr(feature = "dox", doc(cfg(feature = "v2020_8")))]
+    //#[doc(alias = "ostree_repo_static_delta_reindex")]
     //pub fn static_delta_reindex<P: IsA<gio::Cancellable>>(&self, flags: /*Ignored*/StaticDeltaIndexFlags, opt_to_commit: &str, cancellable: Option<&P>) -> Result<(), glib::Error> {
-    //    unsafe { TODO: call ostree_sys:ostree_repo_static_delta_reindex() }
+    //    unsafe { TODO: call ffi:ostree_repo_static_delta_reindex() }
     //}
 
     #[cfg(any(feature = "v2020_7", feature = "dox"))]
-    pub fn static_delta_verify_signature<P: IsA<Sign>>(&self, delta_id: &str, sign: &P) -> Result<Option<GString>, glib::Error> {
+    #[cfg_attr(feature = "dox", doc(cfg(feature = "v2020_7")))]
+    #[doc(alias = "ostree_repo_static_delta_verify_signature")]
+    pub fn static_delta_verify_signature<P: IsA<Sign>>(&self, delta_id: &str, sign: &P) -> Result<Option<glib::GString>, glib::Error> {
         unsafe {
             let mut out_success_message = ptr::null_mut();
             let mut error = ptr::null_mut();
-            let _ = ostree_sys::ostree_repo_static_delta_verify_signature(self.to_glib_none().0, delta_id.to_glib_none().0, sign.as_ref().to_glib_none().0, &mut out_success_message, &mut error);
+            let _ = ffi::ostree_repo_static_delta_verify_signature(self.to_glib_none().0, delta_id.to_glib_none().0, sign.as_ref().to_glib_none().0, &mut out_success_message, &mut error);
             if error.is_null() { Ok(from_glib_full(out_success_message)) } else { Err(from_glib_full(error)) }
         }
     }
 
     #[cfg(any(feature = "v2018_6", feature = "dox"))]
+    #[cfg_attr(feature = "dox", doc(cfg(feature = "v2018_6")))]
+    #[doc(alias = "ostree_repo_transaction_set_collection_ref")]
     pub fn transaction_set_collection_ref(&self, ref_: &CollectionRef, checksum: Option<&str>) {
         unsafe {
-            ostree_sys::ostree_repo_transaction_set_collection_ref(self.to_glib_none().0, ref_.to_glib_none().0, checksum.to_glib_none().0);
+            ffi::ostree_repo_transaction_set_collection_ref(self.to_glib_none().0, ref_.to_glib_none().0, checksum.to_glib_none().0);
         }
     }
 
+    #[doc(alias = "ostree_repo_transaction_set_ref")]
     pub fn transaction_set_ref(&self, remote: Option<&str>, ref_: &str, checksum: Option<&str>) {
         unsafe {
-            ostree_sys::ostree_repo_transaction_set_ref(self.to_glib_none().0, remote.to_glib_none().0, ref_.to_glib_none().0, checksum.to_glib_none().0);
+            ffi::ostree_repo_transaction_set_ref(self.to_glib_none().0, remote.to_glib_none().0, ref_.to_glib_none().0, checksum.to_glib_none().0);
         }
     }
 
+    #[doc(alias = "ostree_repo_transaction_set_refspec")]
     pub fn transaction_set_refspec(&self, refspec: &str, checksum: Option<&str>) {
         unsafe {
-            ostree_sys::ostree_repo_transaction_set_refspec(self.to_glib_none().0, refspec.to_glib_none().0, checksum.to_glib_none().0);
+            ffi::ostree_repo_transaction_set_refspec(self.to_glib_none().0, refspec.to_glib_none().0, checksum.to_glib_none().0);
         }
     }
 
+    //#[doc(alias = "ostree_repo_traverse_commit")]
     //pub fn traverse_commit<P: IsA<gio::Cancellable>>(&self, commit_checksum: &str, maxdepth: i32, out_reachable: /*Unknown conversion*//*Unimplemented*/HashTable TypeId { ns_id: 2, id: 194 }/TypeId { ns_id: 2, id: 194 }, cancellable: Option<&P>) -> Result<(), glib::Error> {
-    //    unsafe { TODO: call ostree_sys:ostree_repo_traverse_commit() }
+    //    unsafe { TODO: call ffi:ostree_repo_traverse_commit() }
     //}
 
+    //#[doc(alias = "ostree_repo_traverse_commit_union")]
     //pub fn traverse_commit_union<P: IsA<gio::Cancellable>>(&self, commit_checksum: &str, maxdepth: i32, inout_reachable: /*Unknown conversion*//*Unimplemented*/HashTable TypeId { ns_id: 0, id: 25 }/TypeId { ns_id: 0, id: 25 }, cancellable: Option<&P>) -> Result<(), glib::Error> {
-    //    unsafe { TODO: call ostree_sys:ostree_repo_traverse_commit_union() }
+    //    unsafe { TODO: call ffi:ostree_repo_traverse_commit_union() }
     //}
 
     //#[cfg(any(feature = "v2018_5", feature = "dox"))]
+    //#[cfg_attr(feature = "dox", doc(cfg(feature = "v2018_5")))]
+    //#[doc(alias = "ostree_repo_traverse_commit_union_with_parents")]
     //pub fn traverse_commit_union_with_parents<P: IsA<gio::Cancellable>>(&self, commit_checksum: &str, maxdepth: i32, inout_reachable: /*Unknown conversion*//*Unimplemented*/HashTable TypeId { ns_id: 0, id: 25 }/TypeId { ns_id: 0, id: 25 }, inout_parents: /*Unknown conversion*//*Unimplemented*/HashTable TypeId { ns_id: 0, id: 25 }/TypeId { ns_id: 0, id: 25 }, cancellable: Option<&P>) -> Result<(), glib::Error> {
-    //    unsafe { TODO: call ostree_sys:ostree_repo_traverse_commit_union_with_parents() }
+    //    unsafe { TODO: call ffi:ostree_repo_traverse_commit_union_with_parents() }
     //}
 
     //#[cfg(any(feature = "v2018_6", feature = "dox"))]
+    //#[cfg_attr(feature = "dox", doc(cfg(feature = "v2018_6")))]
+    //#[doc(alias = "ostree_repo_traverse_reachable_refs")]
     //pub fn traverse_reachable_refs<P: IsA<gio::Cancellable>>(&self, depth: u32, reachable: /*Unknown conversion*//*Unimplemented*/HashTable TypeId { ns_id: 2, id: 194 }/TypeId { ns_id: 2, id: 194 }, cancellable: Option<&P>) -> Result<(), glib::Error> {
-    //    unsafe { TODO: call ostree_sys:ostree_repo_traverse_reachable_refs() }
+    //    unsafe { TODO: call ffi:ostree_repo_traverse_reachable_refs() }
     //}
 
+    #[doc(alias = "ostree_repo_verify_commit")]
     pub fn verify_commit<P: IsA<gio::File>, Q: IsA<gio::File>, R: IsA<gio::Cancellable>>(&self, commit_checksum: &str, keyringdir: Option<&P>, extra_keyring: Option<&Q>, cancellable: Option<&R>) -> Result<(), glib::Error> {
         unsafe {
             let mut error = ptr::null_mut();
-            let _ = ostree_sys::ostree_repo_verify_commit(self.to_glib_none().0, commit_checksum.to_glib_none().0, keyringdir.map(|p| p.as_ref()).to_glib_none().0, extra_keyring.map(|p| p.as_ref()).to_glib_none().0, cancellable.map(|p| p.as_ref()).to_glib_none().0, &mut error);
+            let _ = ffi::ostree_repo_verify_commit(self.to_glib_none().0, commit_checksum.to_glib_none().0, keyringdir.map(|p| p.as_ref()).to_glib_none().0, extra_keyring.map(|p| p.as_ref()).to_glib_none().0, cancellable.map(|p| p.as_ref()).to_glib_none().0, &mut error);
             if error.is_null() { Ok(()) } else { Err(from_glib_full(error)) }
         }
     }
 
+    #[doc(alias = "ostree_repo_verify_commit_ext")]
     pub fn verify_commit_ext<P: IsA<gio::File>, Q: IsA<gio::File>, R: IsA<gio::Cancellable>>(&self, commit_checksum: &str, keyringdir: Option<&P>, extra_keyring: Option<&Q>, cancellable: Option<&R>) -> Result<GpgVerifyResult, glib::Error> {
         unsafe {
             let mut error = ptr::null_mut();
-            let ret = ostree_sys::ostree_repo_verify_commit_ext(self.to_glib_none().0, commit_checksum.to_glib_none().0, keyringdir.map(|p| p.as_ref()).to_glib_none().0, extra_keyring.map(|p| p.as_ref()).to_glib_none().0, cancellable.map(|p| p.as_ref()).to_glib_none().0, &mut error);
+            let ret = ffi::ostree_repo_verify_commit_ext(self.to_glib_none().0, commit_checksum.to_glib_none().0, keyringdir.map(|p| p.as_ref()).to_glib_none().0, extra_keyring.map(|p| p.as_ref()).to_glib_none().0, cancellable.map(|p| p.as_ref()).to_glib_none().0, &mut error);
             if error.is_null() { Ok(from_glib_full(ret)) } else { Err(from_glib_full(error)) }
         }
     }
 
     #[cfg(any(feature = "v2016_14", feature = "dox"))]
+    #[cfg_attr(feature = "dox", doc(cfg(feature = "v2016_14")))]
+    #[doc(alias = "ostree_repo_verify_commit_for_remote")]
     pub fn verify_commit_for_remote<P: IsA<gio::Cancellable>>(&self, commit_checksum: &str, remote_name: &str, cancellable: Option<&P>) -> Result<GpgVerifyResult, glib::Error> {
         unsafe {
             let mut error = ptr::null_mut();
-            let ret = ostree_sys::ostree_repo_verify_commit_for_remote(self.to_glib_none().0, commit_checksum.to_glib_none().0, remote_name.to_glib_none().0, cancellable.map(|p| p.as_ref()).to_glib_none().0, &mut error);
+            let ret = ffi::ostree_repo_verify_commit_for_remote(self.to_glib_none().0, commit_checksum.to_glib_none().0, remote_name.to_glib_none().0, cancellable.map(|p| p.as_ref()).to_glib_none().0, &mut error);
             if error.is_null() { Ok(from_glib_full(ret)) } else { Err(from_glib_full(error)) }
         }
     }
 
+    #[doc(alias = "ostree_repo_verify_summary")]
     pub fn verify_summary<P: IsA<gio::Cancellable>>(&self, remote_name: &str, summary: &glib::Bytes, signatures: &glib::Bytes, cancellable: Option<&P>) -> Result<GpgVerifyResult, glib::Error> {
         unsafe {
             let mut error = ptr::null_mut();
-            let ret = ostree_sys::ostree_repo_verify_summary(self.to_glib_none().0, remote_name.to_glib_none().0, summary.to_glib_none().0, signatures.to_glib_none().0, cancellable.map(|p| p.as_ref()).to_glib_none().0, &mut error);
+            let ret = ffi::ostree_repo_verify_summary(self.to_glib_none().0, remote_name.to_glib_none().0, summary.to_glib_none().0, signatures.to_glib_none().0, cancellable.map(|p| p.as_ref()).to_glib_none().0, &mut error);
             if error.is_null() { Ok(from_glib_full(ret)) } else { Err(from_glib_full(error)) }
         }
     }
 
-    pub fn write_archive_to_mtree<P: IsA<gio::File>, Q: IsA<MutableTree>, R: IsA<gio::Cancellable>>(&self, archive: &P, mtree: &Q, modifier: Option<&RepoCommitModifier>, autocreate_parents: bool, cancellable: Option<&R>) -> Result<(), glib::Error> {
+    #[doc(alias = "ostree_repo_write_archive_to_mtree")]
+    pub fn write_archive_to_mtree<P: IsA<gio::File>, Q: IsA<gio::Cancellable>>(&self, archive: &P, mtree: &MutableTree, modifier: Option<&RepoCommitModifier>, autocreate_parents: bool, cancellable: Option<&Q>) -> Result<(), glib::Error> {
         unsafe {
             let mut error = ptr::null_mut();
-            let _ = ostree_sys::ostree_repo_write_archive_to_mtree(self.to_glib_none().0, archive.as_ref().to_glib_none().0, mtree.as_ref().to_glib_none().0, modifier.to_glib_none().0, autocreate_parents.to_glib(), cancellable.map(|p| p.as_ref()).to_glib_none().0, &mut error);
+            let _ = ffi::ostree_repo_write_archive_to_mtree(self.to_glib_none().0, archive.as_ref().to_glib_none().0, mtree.to_glib_none().0, modifier.to_glib_none().0, autocreate_parents.into_glib(), cancellable.map(|p| p.as_ref()).to_glib_none().0, &mut error);
             if error.is_null() { Ok(()) } else { Err(from_glib_full(error)) }
         }
     }
 
-    pub fn write_archive_to_mtree_from_fd<P: IsA<MutableTree>, Q: IsA<gio::Cancellable>>(&self, fd: i32, mtree: &P, modifier: Option<&RepoCommitModifier>, autocreate_parents: bool, cancellable: Option<&Q>) -> Result<(), glib::Error> {
+    #[doc(alias = "ostree_repo_write_archive_to_mtree_from_fd")]
+    pub fn write_archive_to_mtree_from_fd<P: IsA<gio::Cancellable>>(&self, fd: i32, mtree: &MutableTree, modifier: Option<&RepoCommitModifier>, autocreate_parents: bool, cancellable: Option<&P>) -> Result<(), glib::Error> {
         unsafe {
             let mut error = ptr::null_mut();
-            let _ = ostree_sys::ostree_repo_write_archive_to_mtree_from_fd(self.to_glib_none().0, fd, mtree.as_ref().to_glib_none().0, modifier.to_glib_none().0, autocreate_parents.to_glib(), cancellable.map(|p| p.as_ref()).to_glib_none().0, &mut error);
+            let _ = ffi::ostree_repo_write_archive_to_mtree_from_fd(self.to_glib_none().0, fd, mtree.to_glib_none().0, modifier.to_glib_none().0, autocreate_parents.into_glib(), cancellable.map(|p| p.as_ref()).to_glib_none().0, &mut error);
             if error.is_null() { Ok(()) } else { Err(from_glib_full(error)) }
         }
     }
 
-    pub fn write_commit<P: IsA<RepoFile>, Q: IsA<gio::Cancellable>>(&self, parent: Option<&str>, subject: Option<&str>, body: Option<&str>, metadata: Option<&glib::Variant>, root: &P, cancellable: Option<&Q>) -> Result<GString, glib::Error> {
+    #[doc(alias = "ostree_repo_write_commit")]
+    pub fn write_commit<P: IsA<gio::Cancellable>>(&self, parent: Option<&str>, subject: Option<&str>, body: Option<&str>, metadata: Option<&glib::Variant>, root: &RepoFile, cancellable: Option<&P>) -> Result<glib::GString, glib::Error> {
         unsafe {
             let mut out_commit = ptr::null_mut();
             let mut error = ptr::null_mut();
-            let _ = ostree_sys::ostree_repo_write_commit(self.to_glib_none().0, parent.to_glib_none().0, subject.to_glib_none().0, body.to_glib_none().0, metadata.to_glib_none().0, root.as_ref().to_glib_none().0, &mut out_commit, cancellable.map(|p| p.as_ref()).to_glib_none().0, &mut error);
+            let _ = ffi::ostree_repo_write_commit(self.to_glib_none().0, parent.to_glib_none().0, subject.to_glib_none().0, body.to_glib_none().0, metadata.to_glib_none().0, root.to_glib_none().0, &mut out_commit, cancellable.map(|p| p.as_ref()).to_glib_none().0, &mut error);
             if error.is_null() { Ok(from_glib_full(out_commit)) } else { Err(from_glib_full(error)) }
         }
     }
 
+    #[doc(alias = "ostree_repo_write_commit_detached_metadata")]
     pub fn write_commit_detached_metadata<P: IsA<gio::Cancellable>>(&self, checksum: &str, metadata: Option<&glib::Variant>, cancellable: Option<&P>) -> Result<(), glib::Error> {
         unsafe {
             let mut error = ptr::null_mut();
-            let _ = ostree_sys::ostree_repo_write_commit_detached_metadata(self.to_glib_none().0, checksum.to_glib_none().0, metadata.to_glib_none().0, cancellable.map(|p| p.as_ref()).to_glib_none().0, &mut error);
+            let _ = ffi::ostree_repo_write_commit_detached_metadata(self.to_glib_none().0, checksum.to_glib_none().0, metadata.to_glib_none().0, cancellable.map(|p| p.as_ref()).to_glib_none().0, &mut error);
             if error.is_null() { Ok(()) } else { Err(from_glib_full(error)) }
         }
     }
 
-    pub fn write_commit_with_time<P: IsA<RepoFile>, Q: IsA<gio::Cancellable>>(&self, parent: Option<&str>, subject: Option<&str>, body: Option<&str>, metadata: Option<&glib::Variant>, root: &P, time: u64, cancellable: Option<&Q>) -> Result<GString, glib::Error> {
+    #[doc(alias = "ostree_repo_write_commit_with_time")]
+    pub fn write_commit_with_time<P: IsA<gio::Cancellable>>(&self, parent: Option<&str>, subject: Option<&str>, body: Option<&str>, metadata: Option<&glib::Variant>, root: &RepoFile, time: u64, cancellable: Option<&P>) -> Result<glib::GString, glib::Error> {
         unsafe {
             let mut out_commit = ptr::null_mut();
             let mut error = ptr::null_mut();
-            let _ = ostree_sys::ostree_repo_write_commit_with_time(self.to_glib_none().0, parent.to_glib_none().0, subject.to_glib_none().0, body.to_glib_none().0, metadata.to_glib_none().0, root.as_ref().to_glib_none().0, time, &mut out_commit, cancellable.map(|p| p.as_ref()).to_glib_none().0, &mut error);
+            let _ = ffi::ostree_repo_write_commit_with_time(self.to_glib_none().0, parent.to_glib_none().0, subject.to_glib_none().0, body.to_glib_none().0, metadata.to_glib_none().0, root.to_glib_none().0, time, &mut out_commit, cancellable.map(|p| p.as_ref()).to_glib_none().0, &mut error);
             if error.is_null() { Ok(from_glib_full(out_commit)) } else { Err(from_glib_full(error)) }
         }
     }
 
+    #[doc(alias = "ostree_repo_write_config")]
     pub fn write_config(&self, new_config: &glib::KeyFile) -> Result<(), glib::Error> {
         unsafe {
             let mut error = ptr::null_mut();
-            let _ = ostree_sys::ostree_repo_write_config(self.to_glib_none().0, new_config.to_glib_none().0, &mut error);
+            let _ = ffi::ostree_repo_write_config(self.to_glib_none().0, new_config.to_glib_none().0, &mut error);
             if error.is_null() { Ok(()) } else { Err(from_glib_full(error)) }
         }
     }
 
+    #[doc(alias = "ostree_repo_write_content_trusted")]
     pub fn write_content_trusted<P: IsA<gio::InputStream>, Q: IsA<gio::Cancellable>>(&self, checksum: &str, object_input: &P, length: u64, cancellable: Option<&Q>) -> Result<(), glib::Error> {
         unsafe {
             let mut error = ptr::null_mut();
-            let _ = ostree_sys::ostree_repo_write_content_trusted(self.to_glib_none().0, checksum.to_glib_none().0, object_input.as_ref().to_glib_none().0, length, cancellable.map(|p| p.as_ref()).to_glib_none().0, &mut error);
+            let _ = ffi::ostree_repo_write_content_trusted(self.to_glib_none().0, checksum.to_glib_none().0, object_input.as_ref().to_glib_none().0, length, cancellable.map(|p| p.as_ref()).to_glib_none().0, &mut error);
             if error.is_null() { Ok(()) } else { Err(from_glib_full(error)) }
         }
     }
 
-    pub fn write_dfd_to_mtree<P: IsA<MutableTree>, Q: IsA<gio::Cancellable>>(&self, dfd: i32, path: &str, mtree: &P, modifier: Option<&RepoCommitModifier>, cancellable: Option<&Q>) -> Result<(), glib::Error> {
+    #[doc(alias = "ostree_repo_write_dfd_to_mtree")]
+    pub fn write_dfd_to_mtree<P: IsA<gio::Cancellable>>(&self, dfd: i32, path: &str, mtree: &MutableTree, modifier: Option<&RepoCommitModifier>, cancellable: Option<&P>) -> Result<(), glib::Error> {
         unsafe {
             let mut error = ptr::null_mut();
-            let _ = ostree_sys::ostree_repo_write_dfd_to_mtree(self.to_glib_none().0, dfd, path.to_glib_none().0, mtree.as_ref().to_glib_none().0, modifier.to_glib_none().0, cancellable.map(|p| p.as_ref()).to_glib_none().0, &mut error);
+            let _ = ffi::ostree_repo_write_dfd_to_mtree(self.to_glib_none().0, dfd, path.to_glib_none().0, mtree.to_glib_none().0, modifier.to_glib_none().0, cancellable.map(|p| p.as_ref()).to_glib_none().0, &mut error);
             if error.is_null() { Ok(()) } else { Err(from_glib_full(error)) }
         }
     }
 
-    pub fn write_directory_to_mtree<P: IsA<gio::File>, Q: IsA<MutableTree>, R: IsA<gio::Cancellable>>(&self, dir: &P, mtree: &Q, modifier: Option<&RepoCommitModifier>, cancellable: Option<&R>) -> Result<(), glib::Error> {
+    #[doc(alias = "ostree_repo_write_directory_to_mtree")]
+    pub fn write_directory_to_mtree<P: IsA<gio::File>, Q: IsA<gio::Cancellable>>(&self, dir: &P, mtree: &MutableTree, modifier: Option<&RepoCommitModifier>, cancellable: Option<&Q>) -> Result<(), glib::Error> {
         unsafe {
             let mut error = ptr::null_mut();
-            let _ = ostree_sys::ostree_repo_write_directory_to_mtree(self.to_glib_none().0, dir.as_ref().to_glib_none().0, mtree.as_ref().to_glib_none().0, modifier.to_glib_none().0, cancellable.map(|p| p.as_ref()).to_glib_none().0, &mut error);
+            let _ = ffi::ostree_repo_write_directory_to_mtree(self.to_glib_none().0, dir.as_ref().to_glib_none().0, mtree.to_glib_none().0, modifier.to_glib_none().0, cancellable.map(|p| p.as_ref()).to_glib_none().0, &mut error);
             if error.is_null() { Ok(()) } else { Err(from_glib_full(error)) }
         }
     }
 
+    #[doc(alias = "ostree_repo_write_metadata_stream_trusted")]
     pub fn write_metadata_stream_trusted<P: IsA<gio::InputStream>, Q: IsA<gio::Cancellable>>(&self, objtype: ObjectType, checksum: &str, object_input: &P, length: u64, cancellable: Option<&Q>) -> Result<(), glib::Error> {
         unsafe {
             let mut error = ptr::null_mut();
-            let _ = ostree_sys::ostree_repo_write_metadata_stream_trusted(self.to_glib_none().0, objtype.to_glib(), checksum.to_glib_none().0, object_input.as_ref().to_glib_none().0, length, cancellable.map(|p| p.as_ref()).to_glib_none().0, &mut error);
+            let _ = ffi::ostree_repo_write_metadata_stream_trusted(self.to_glib_none().0, objtype.into_glib(), checksum.to_glib_none().0, object_input.as_ref().to_glib_none().0, length, cancellable.map(|p| p.as_ref()).to_glib_none().0, &mut error);
             if error.is_null() { Ok(()) } else { Err(from_glib_full(error)) }
         }
     }
 
+    #[doc(alias = "ostree_repo_write_metadata_trusted")]
     pub fn write_metadata_trusted<P: IsA<gio::Cancellable>>(&self, objtype: ObjectType, checksum: &str, variant: &glib::Variant, cancellable: Option<&P>) -> Result<(), glib::Error> {
         unsafe {
             let mut error = ptr::null_mut();
-            let _ = ostree_sys::ostree_repo_write_metadata_trusted(self.to_glib_none().0, objtype.to_glib(), checksum.to_glib_none().0, variant.to_glib_none().0, cancellable.map(|p| p.as_ref()).to_glib_none().0, &mut error);
+            let _ = ffi::ostree_repo_write_metadata_trusted(self.to_glib_none().0, objtype.into_glib(), checksum.to_glib_none().0, variant.to_glib_none().0, cancellable.map(|p| p.as_ref()).to_glib_none().0, &mut error);
             if error.is_null() { Ok(()) } else { Err(from_glib_full(error)) }
         }
     }
 
-    pub fn write_mtree<P: IsA<MutableTree>, Q: IsA<gio::Cancellable>>(&self, mtree: &P, cancellable: Option<&Q>) -> Result<gio::File, glib::Error> {
+    #[doc(alias = "ostree_repo_write_mtree")]
+    pub fn write_mtree<P: IsA<gio::Cancellable>>(&self, mtree: &MutableTree, cancellable: Option<&P>) -> Result<gio::File, glib::Error> {
         unsafe {
             let mut out_file = ptr::null_mut();
             let mut error = ptr::null_mut();
-            let _ = ostree_sys::ostree_repo_write_mtree(self.to_glib_none().0, mtree.as_ref().to_glib_none().0, &mut out_file, cancellable.map(|p| p.as_ref()).to_glib_none().0, &mut error);
+            let _ = ffi::ostree_repo_write_mtree(self.to_glib_none().0, mtree.to_glib_none().0, &mut out_file, cancellable.map(|p| p.as_ref()).to_glib_none().0, &mut error);
             if error.is_null() { Ok(from_glib_full(out_file)) } else { Err(from_glib_full(error)) }
         }
     }
 
     #[cfg(any(feature = "v2021_2", feature = "dox"))]
+    #[cfg_attr(feature = "dox", doc(cfg(feature = "v2021_2")))]
+    #[doc(alias = "ostree_repo_write_regfile")]
     pub fn write_regfile(&self, expected_checksum: Option<&str>, uid: u32, gid: u32, mode: u32, content_len: u64, xattrs: Option<&glib::Variant>) -> Result<ContentWriter, glib::Error> {
         unsafe {
             let mut error = ptr::null_mut();
-            let ret = ostree_sys::ostree_repo_write_regfile(self.to_glib_none().0, expected_checksum.to_glib_none().0, uid, gid, mode, content_len, xattrs.to_glib_none().0, &mut error);
+            let ret = ffi::ostree_repo_write_regfile(self.to_glib_none().0, expected_checksum.to_glib_none().0, uid, gid, mode, content_len, xattrs.to_glib_none().0, &mut error);
             if error.is_null() { Ok(from_glib_full(ret)) } else { Err(from_glib_full(error)) }
         }
     }
 
     #[cfg(any(feature = "v2021_2", feature = "dox"))]
-    pub fn write_regfile_inline<P: IsA<gio::Cancellable>>(&self, expected_checksum: Option<&str>, uid: u32, gid: u32, mode: u32, xattrs: Option<&glib::Variant>, buf: &[u8], cancellable: Option<&P>) -> Result<GString, glib::Error> {
+    #[cfg_attr(feature = "dox", doc(cfg(feature = "v2021_2")))]
+    #[doc(alias = "ostree_repo_write_regfile_inline")]
+    pub fn write_regfile_inline<P: IsA<gio::Cancellable>>(&self, expected_checksum: Option<&str>, uid: u32, gid: u32, mode: u32, xattrs: Option<&glib::Variant>, buf: &[u8], cancellable: Option<&P>) -> Result<glib::GString, glib::Error> {
         let len = buf.len() as usize;
         unsafe {
             let mut error = ptr::null_mut();
-            let ret = ostree_sys::ostree_repo_write_regfile_inline(self.to_glib_none().0, expected_checksum.to_glib_none().0, uid, gid, mode, xattrs.to_glib_none().0, buf.to_glib_none().0, len, cancellable.map(|p| p.as_ref()).to_glib_none().0, &mut error);
+            let ret = ffi::ostree_repo_write_regfile_inline(self.to_glib_none().0, expected_checksum.to_glib_none().0, uid, gid, mode, xattrs.to_glib_none().0, buf.to_glib_none().0, len, cancellable.map(|p| p.as_ref()).to_glib_none().0, &mut error);
             if error.is_null() { Ok(from_glib_full(ret)) } else { Err(from_glib_full(error)) }
         }
     }
 
     #[cfg(any(feature = "v2021_2", feature = "dox"))]
-    pub fn write_symlink<P: IsA<gio::Cancellable>>(&self, expected_checksum: Option<&str>, uid: u32, gid: u32, xattrs: Option<&glib::Variant>, symlink_target: &str, cancellable: Option<&P>) -> Result<GString, glib::Error> {
+    #[cfg_attr(feature = "dox", doc(cfg(feature = "v2021_2")))]
+    #[doc(alias = "ostree_repo_write_symlink")]
+    pub fn write_symlink<P: IsA<gio::Cancellable>>(&self, expected_checksum: Option<&str>, uid: u32, gid: u32, xattrs: Option<&glib::Variant>, symlink_target: &str, cancellable: Option<&P>) -> Result<glib::GString, glib::Error> {
         unsafe {
             let mut error = ptr::null_mut();
-            let ret = ostree_sys::ostree_repo_write_symlink(self.to_glib_none().0, expected_checksum.to_glib_none().0, uid, gid, xattrs.to_glib_none().0, symlink_target.to_glib_none().0, cancellable.map(|p| p.as_ref()).to_glib_none().0, &mut error);
+            let ret = ffi::ostree_repo_write_symlink(self.to_glib_none().0, expected_checksum.to_glib_none().0, uid, gid, xattrs.to_glib_none().0, symlink_target.to_glib_none().0, cancellable.map(|p| p.as_ref()).to_glib_none().0, &mut error);
             if error.is_null() { Ok(from_glib_full(ret)) } else { Err(from_glib_full(error)) }
         }
     }
 
-    pub fn get_property_remotes_config_dir(&self) -> Option<GString> {
+    #[doc(alias = "remotes-config-dir")]
+    pub fn remotes_config_dir(&self) -> Option<glib::GString> {
         unsafe {
-            let mut value = Value::from_type(<GString as StaticType>::static_type());
-            gobject_sys::g_object_get_property(self.as_ptr() as *mut gobject_sys::GObject, b"remotes-config-dir\0".as_ptr() as *const _, value.to_glib_none_mut().0);
+            let mut value = glib::Value::from_type(<glib::GString as StaticType>::static_type());
+            glib::gobject_ffi::g_object_get_property(self.as_ptr() as *mut glib::gobject_ffi::GObject, b"remotes-config-dir\0".as_ptr() as *const _, value.to_glib_none_mut().0);
             value.get().expect("Return Value for property `remotes-config-dir` getter")
         }
     }
 
-    pub fn get_property_sysroot_path(&self) -> Option<gio::File> {
+    #[doc(alias = "sysroot-path")]
+    pub fn sysroot_path(&self) -> Option<gio::File> {
         unsafe {
-            let mut value = Value::from_type(<gio::File as StaticType>::static_type());
-            gobject_sys::g_object_get_property(self.as_ptr() as *mut gobject_sys::GObject, b"sysroot-path\0".as_ptr() as *const _, value.to_glib_none_mut().0);
+            let mut value = glib::Value::from_type(<gio::File as StaticType>::static_type());
+            glib::gobject_ffi::g_object_get_property(self.as_ptr() as *mut glib::gobject_ffi::GObject, b"sysroot-path\0".as_ptr() as *const _, value.to_glib_none_mut().0);
             value.get().expect("Return Value for property `sysroot-path` getter")
         }
     }
 
     #[cfg(any(feature = "v2017_10", feature = "dox"))]
+    #[cfg_attr(feature = "dox", doc(cfg(feature = "v2017_10")))]
+    #[doc(alias = "ostree_repo_create_at")]
     pub fn create_at<P: IsA<gio::Cancellable>>(dfd: i32, path: &str, mode: RepoMode, options: Option<&glib::Variant>, cancellable: Option<&P>) -> Result<Repo, glib::Error> {
         unsafe {
             let mut error = ptr::null_mut();
-            let ret = ostree_sys::ostree_repo_create_at(dfd, path.to_glib_none().0, mode.to_glib(), options.to_glib_none().0, cancellable.map(|p| p.as_ref()).to_glib_none().0, &mut error);
+            let ret = ffi::ostree_repo_create_at(dfd, path.to_glib_none().0, mode.into_glib(), options.to_glib_none().0, cancellable.map(|p| p.as_ref()).to_glib_none().0, &mut error);
             if error.is_null() { Ok(from_glib_full(ret)) } else { Err(from_glib_full(error)) }
         }
     }
 
+    #[doc(alias = "ostree_repo_mode_from_string")]
     pub fn mode_from_string(mode: &str) -> Result<RepoMode, glib::Error> {
         unsafe {
             let mut out_mode = mem::MaybeUninit::uninit();
             let mut error = ptr::null_mut();
-            let _ = ostree_sys::ostree_repo_mode_from_string(mode.to_glib_none().0, out_mode.as_mut_ptr(), &mut error);
+            let _ = ffi::ostree_repo_mode_from_string(mode.to_glib_none().0, out_mode.as_mut_ptr(), &mut error);
             let out_mode = out_mode.assume_init();
             if error.is_null() { Ok(from_glib(out_mode)) } else { Err(from_glib_full(error)) }
         }
     }
 
     #[cfg(any(feature = "v2017_10", feature = "dox"))]
+    #[cfg_attr(feature = "dox", doc(cfg(feature = "v2017_10")))]
+    #[doc(alias = "ostree_repo_open_at")]
     pub fn open_at<P: IsA<gio::Cancellable>>(dfd: i32, path: &str, cancellable: Option<&P>) -> Result<Repo, glib::Error> {
         unsafe {
             let mut error = ptr::null_mut();
-            let ret = ostree_sys::ostree_repo_open_at(dfd, path.to_glib_none().0, cancellable.map(|p| p.as_ref()).to_glib_none().0, &mut error);
+            let ret = ffi::ostree_repo_open_at(dfd, path.to_glib_none().0, cancellable.map(|p| p.as_ref()).to_glib_none().0, &mut error);
             if error.is_null() { Ok(from_glib_full(ret)) } else { Err(from_glib_full(error)) }
         }
     }
 
-    //pub fn pull_default_console_progress_changed<P: IsA<AsyncProgress>>(progress: &P, user_data: /*Unimplemented*/Option<Fundamental: Pointer>) {
-    //    unsafe { TODO: call ostree_sys:ostree_repo_pull_default_console_progress_changed() }
+    //#[doc(alias = "ostree_repo_pull_default_console_progress_changed")]
+    //pub fn pull_default_console_progress_changed(progress: &AsyncProgress, user_data: /*Unimplemented*/Option<Fundamental: Pointer>) {
+    //    unsafe { TODO: call ffi:ostree_repo_pull_default_console_progress_changed() }
     //}
 
     //#[cfg(any(feature = "v2018_5", feature = "dox"))]
+    //#[cfg_attr(feature = "dox", doc(cfg(feature = "v2018_5")))]
+    //#[doc(alias = "ostree_repo_traverse_new_parents")]
     //pub fn traverse_new_parents() -> /*Unknown conversion*//*Unimplemented*/HashTable TypeId { ns_id: 2, id: 194 }/TypeId { ns_id: 2, id: 194 } {
-    //    unsafe { TODO: call ostree_sys:ostree_repo_traverse_new_parents() }
+    //    unsafe { TODO: call ffi:ostree_repo_traverse_new_parents() }
     //}
 
+    //#[doc(alias = "ostree_repo_traverse_new_reachable")]
     //pub fn traverse_new_reachable() -> /*Unknown conversion*//*Unimplemented*/HashTable TypeId { ns_id: 2, id: 194 }/TypeId { ns_id: 2, id: 194 } {
-    //    unsafe { TODO: call ostree_sys:ostree_repo_traverse_new_reachable() }
+    //    unsafe { TODO: call ffi:ostree_repo_traverse_new_reachable() }
     //}
 
     //#[cfg(any(feature = "v2018_5", feature = "dox"))]
-    //pub fn traverse_parents_get_commits(parents: /*Unknown conversion*//*Unimplemented*/HashTable TypeId { ns_id: 0, id: 25 }/TypeId { ns_id: 0, id: 25 }, object: &glib::Variant) -> Vec<GString> {
-    //    unsafe { TODO: call ostree_sys:ostree_repo_traverse_parents_get_commits() }
+    //#[cfg_attr(feature = "dox", doc(cfg(feature = "v2018_5")))]
+    //#[doc(alias = "ostree_repo_traverse_parents_get_commits")]
+    //pub fn traverse_parents_get_commits(parents: /*Unknown conversion*//*Unimplemented*/HashTable TypeId { ns_id: 0, id: 25 }/TypeId { ns_id: 0, id: 25 }, object: &glib::Variant) -> Vec<glib::GString> {
+    //    unsafe { TODO: call ffi:ostree_repo_traverse_parents_get_commits() }
     //}
 
-    pub fn connect_gpg_verify_result<F: Fn(&Repo, &str, &GpgVerifyResult) + Send + 'static>(&self, f: F) -> SignalHandlerId {
-        unsafe extern "C" fn gpg_verify_result_trampoline<F: Fn(&Repo, &str, &GpgVerifyResult) + Send + 'static>(this: *mut ostree_sys::OstreeRepo, checksum: *mut libc::c_char, result: *mut ostree_sys::OstreeGpgVerifyResult, f: glib_sys::gpointer) {
+    #[doc(alias = "gpg-verify-result")]
+    pub fn connect_gpg_verify_result<F: Fn(&Self, &str, &GpgVerifyResult) + Send + 'static>(&self, f: F) -> SignalHandlerId {
+        unsafe extern "C" fn gpg_verify_result_trampoline<F: Fn(&Repo, &str, &GpgVerifyResult) + Send + 'static>(this: *mut ffi::OstreeRepo, checksum: *mut libc::c_char, result: *mut ffi::OstreeGpgVerifyResult, f: glib::ffi::gpointer) {
             let f: &F = &*(f as *const F);
-            f(&from_glib_borrow(this), &GString::from_glib_borrow(checksum), &from_glib_borrow(result))
+            f(&from_glib_borrow(this), &glib::GString::from_glib_borrow(checksum), &from_glib_borrow(result))
         }
         unsafe {
             let f: Box_<F> = Box_::new(f);
@@ -1107,6 +1297,6 @@ unsafe impl Send for Repo {}
 
 impl fmt::Display for Repo {
     fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        write!(f, "Repo")
+        f.write_str("Repo")
     }
 }
index f75ae9941d31a9e5d5be3684db4a2dac68a63dd6..eea16a82a0c0a9c424996b8c3efdc56751c1bf8f 100644 (file)
@@ -1,41 +1,41 @@
 // This file was generated by gir (https://github.com/gtk-rs/gir)
-// from gir-files (https://github.com/gtk-rs/gir-files)
+// from gir-files
 // DO NOT EDIT
 
-use gio;
-use glib;
+use crate::Repo;
+use crate::RepoCommitFilterResult;
+use crate::RepoCommitModifierFlags;
+#[cfg(any(feature = "v2017_13", feature = "dox"))]
+#[cfg_attr(feature = "dox", doc(cfg(feature = "v2017_13")))]
+use crate::RepoDevInoCache;
+use crate::SePolicy;
 #[cfg(any(feature = "v2020_4", feature = "dox"))]
+#[cfg_attr(feature = "dox", doc(cfg(feature = "v2020_4")))]
 use glib::object::IsA;
 use glib::translate::*;
-use glib::GString;
-use ostree_sys;
 use std::boxed::Box as Box_;
 #[cfg(any(feature = "v2020_4", feature = "dox"))]
+#[cfg_attr(feature = "dox", doc(cfg(feature = "v2020_4")))]
 use std::ptr;
-use Repo;
-use RepoCommitFilterResult;
-use RepoCommitModifierFlags;
-#[cfg(any(feature = "v2017_13", feature = "dox"))]
-use RepoDevInoCache;
-use SePolicy;
 
-glib_wrapper! {
+glib::wrapper! {
     #[derive(Debug, PartialEq, Eq, PartialOrd, Ord, Hash)]
-    pub struct RepoCommitModifier(Shared<ostree_sys::OstreeRepoCommitModifier>);
+    pub struct RepoCommitModifier(Shared<ffi::OstreeRepoCommitModifier>);
 
     match fn {
-        ref => |ptr| ostree_sys::ostree_repo_commit_modifier_ref(ptr),
-        unref => |ptr| ostree_sys::ostree_repo_commit_modifier_unref(ptr),
-        get_type => || ostree_sys::ostree_repo_commit_modifier_get_type(),
+        ref => |ptr| ffi::ostree_repo_commit_modifier_ref(ptr),
+        unref => |ptr| ffi::ostree_repo_commit_modifier_unref(ptr),
+        type_ => || ffi::ostree_repo_commit_modifier_get_type(),
     }
 }
 
 impl RepoCommitModifier {
+    #[doc(alias = "ostree_repo_commit_modifier_new")]
     pub fn new(flags: RepoCommitModifierFlags, commit_filter: Option<Box_<dyn Fn(&Repo, &str, &gio::FileInfo) -> RepoCommitFilterResult + 'static>>) -> RepoCommitModifier {
         let commit_filter_data: Box_<Option<Box_<dyn Fn(&Repo, &str, &gio::FileInfo) -> RepoCommitFilterResult + 'static>>> = Box_::new(commit_filter);
-        unsafe extern "C" fn commit_filter_func(repo: *mut ostree_sys::OstreeRepo, path: *const libc::c_char, file_info: *mut gio_sys::GFileInfo, user_data: glib_sys::gpointer) -> ostree_sys::OstreeRepoCommitFilterResult {
+        unsafe extern "C" fn commit_filter_func(repo: *mut ffi::OstreeRepo, path: *const libc::c_char, file_info: *mut gio::ffi::GFileInfo, user_data: glib::ffi::gpointer) -> ffi::OstreeRepoCommitFilterResult {
             let repo = from_glib_borrow(repo);
-            let path: Borrowed<GString> = from_glib_borrow(path);
+            let path: Borrowed<glib::GString> = from_glib_borrow(path);
             let file_info = from_glib_borrow(file_info);
             let callback: &Option<Box_<dyn Fn(&Repo, &str, &gio::FileInfo) -> RepoCommitFilterResult + 'static>> = &*(user_data as *mut _);
             let res = if let Some(ref callback) = *callback {
@@ -43,59 +43,65 @@ impl RepoCommitModifier {
             } else {
                 panic!("cannot get closure...")
             };
-            res.to_glib()
+            res.into_glib()
         }
         let commit_filter = if commit_filter_data.is_some() { Some(commit_filter_func as _) } else { None };
-        unsafe extern "C" fn destroy_notify_func(data: glib_sys::gpointer) {
+        unsafe extern "C" fn destroy_notify_func(data: glib::ffi::gpointer) {
             let _callback: Box_<Option<Box_<dyn Fn(&Repo, &str, &gio::FileInfo) -> RepoCommitFilterResult + 'static>>> = Box_::from_raw(data as *mut _);
         }
         let destroy_call3 = Some(destroy_notify_func as _);
         let super_callback0: Box_<Option<Box_<dyn Fn(&Repo, &str, &gio::FileInfo) -> RepoCommitFilterResult + 'static>>> = commit_filter_data;
         unsafe {
-            from_glib_full(ostree_sys::ostree_repo_commit_modifier_new(flags.to_glib(), commit_filter, Box_::into_raw(super_callback0) as *mut _, destroy_call3))
+            from_glib_full(ffi::ostree_repo_commit_modifier_new(flags.into_glib(), commit_filter, Box_::into_raw(super_callback0) as *mut _, destroy_call3))
         }
     }
 
     #[cfg(any(feature = "v2017_13", feature = "dox"))]
+    #[cfg_attr(feature = "dox", doc(cfg(feature = "v2017_13")))]
+    #[doc(alias = "ostree_repo_commit_modifier_set_devino_cache")]
     pub fn set_devino_cache(&self, cache: &RepoDevInoCache) {
         unsafe {
-            ostree_sys::ostree_repo_commit_modifier_set_devino_cache(self.to_glib_none().0, cache.to_glib_none().0);
+            ffi::ostree_repo_commit_modifier_set_devino_cache(self.to_glib_none().0, cache.to_glib_none().0);
         }
     }
 
+    #[doc(alias = "ostree_repo_commit_modifier_set_sepolicy")]
     pub fn set_sepolicy(&self, sepolicy: Option<&SePolicy>) {
         unsafe {
-            ostree_sys::ostree_repo_commit_modifier_set_sepolicy(self.to_glib_none().0, sepolicy.to_glib_none().0);
+            ffi::ostree_repo_commit_modifier_set_sepolicy(self.to_glib_none().0, sepolicy.to_glib_none().0);
         }
     }
 
     #[cfg(any(feature = "v2020_4", feature = "dox"))]
+    #[cfg_attr(feature = "dox", doc(cfg(feature = "v2020_4")))]
+    #[doc(alias = "ostree_repo_commit_modifier_set_sepolicy_from_commit")]
     pub fn set_sepolicy_from_commit<P: IsA<gio::Cancellable>>(&self, repo: &Repo, rev: &str, cancellable: Option<&P>) -> Result<(), glib::Error> {
         unsafe {
             let mut error = ptr::null_mut();
-            let _ = ostree_sys::ostree_repo_commit_modifier_set_sepolicy_from_commit(self.to_glib_none().0, repo.to_glib_none().0, rev.to_glib_none().0, cancellable.map(|p| p.as_ref()).to_glib_none().0, &mut error);
+            let _ = ffi::ostree_repo_commit_modifier_set_sepolicy_from_commit(self.to_glib_none().0, repo.to_glib_none().0, rev.to_glib_none().0, cancellable.map(|p| p.as_ref()).to_glib_none().0, &mut error);
             if error.is_null() { Ok(()) } else { Err(from_glib_full(error)) }
         }
     }
 
+    #[doc(alias = "ostree_repo_commit_modifier_set_xattr_callback")]
     pub fn set_xattr_callback<P: Fn(&Repo, &str, &gio::FileInfo) -> glib::Variant + 'static>(&self, callback: P) {
         let callback_data: Box_<P> = Box_::new(callback);
-        unsafe extern "C" fn callback_func<P: Fn(&Repo, &str, &gio::FileInfo) -> glib::Variant + 'static>(repo: *mut ostree_sys::OstreeRepo, path: *const libc::c_char, file_info: *mut gio_sys::GFileInfo, user_data: glib_sys::gpointer) -> *mut glib_sys::GVariant {
+        unsafe extern "C" fn callback_func<P: Fn(&Repo, &str, &gio::FileInfo) -> glib::Variant + 'static>(repo: *mut ffi::OstreeRepo, path: *const libc::c_char, file_info: *mut gio::ffi::GFileInfo, user_data: glib::ffi::gpointer) -> *mut glib::ffi::GVariant {
             let repo = from_glib_borrow(repo);
-            let path: Borrowed<GString> = from_glib_borrow(path);
+            let path: Borrowed<glib::GString> = from_glib_borrow(path);
             let file_info = from_glib_borrow(file_info);
             let callback: &P = &*(user_data as *mut _);
             let res = (*callback)(&repo, path.as_str(), &file_info);
             res.to_glib_full()
         }
         let callback = Some(callback_func::<P> as _);
-        unsafe extern "C" fn destroy_func<P: Fn(&Repo, &str, &gio::FileInfo) -> glib::Variant + 'static>(data: glib_sys::gpointer) {
+        unsafe extern "C" fn destroy_func<P: Fn(&Repo, &str, &gio::FileInfo) -> glib::Variant + 'static>(data: glib::ffi::gpointer) {
             let _callback: Box_<P> = Box_::from_raw(data as *mut _);
         }
         let destroy_call2 = Some(destroy_func::<P> as _);
         let super_callback0: Box_<P> = callback_data;
         unsafe {
-            ostree_sys::ostree_repo_commit_modifier_set_xattr_callback(self.to_glib_none().0, callback, destroy_call2, Box_::into_raw(super_callback0) as *mut _);
+            ffi::ostree_repo_commit_modifier_set_xattr_callback(self.to_glib_none().0, callback, destroy_call2, Box_::into_raw(super_callback0) as *mut _);
         }
     }
 }
index 70ca418bdf8dc439b9269df60e2c61e7bf75f154..1cc7cd438a5a7cc6bca9c994a022cc72e4d5527e 100644 (file)
@@ -1,25 +1,25 @@
 // This file was generated by gir (https://github.com/gtk-rs/gir)
-// from gir-files (https://github.com/gtk-rs/gir-files)
+// from gir-files
 // DO NOT EDIT
 
 use glib::translate::*;
-use ostree_sys;
 
-glib_wrapper! {
+glib::wrapper! {
     #[derive(Debug, PartialEq, Eq, PartialOrd, Ord, Hash)]
-    pub struct RepoDevInoCache(Shared<ostree_sys::OstreeRepoDevInoCache>);
+    pub struct RepoDevInoCache(Shared<ffi::OstreeRepoDevInoCache>);
 
     match fn {
-        ref => |ptr| ostree_sys::ostree_repo_devino_cache_ref(ptr),
-        unref => |ptr| ostree_sys::ostree_repo_devino_cache_unref(ptr),
-        get_type => || ostree_sys::ostree_repo_devino_cache_get_type(),
+        ref => |ptr| ffi::ostree_repo_devino_cache_ref(ptr),
+        unref => |ptr| ffi::ostree_repo_devino_cache_unref(ptr),
+        type_ => || ffi::ostree_repo_devino_cache_get_type(),
     }
 }
 
 impl RepoDevInoCache {
+    #[doc(alias = "ostree_repo_devino_cache_new")]
     pub fn new() -> RepoDevInoCache {
         unsafe {
-            from_glib_full(ostree_sys::ostree_repo_devino_cache_new())
+            from_glib_full(ffi::ostree_repo_devino_cache_new())
         }
     }
 }
index 0a59406f634ff8891187bbf66d9c8c9425604acc..07c17ee754492a0e98795dffdfda15ca7dfa8481 100644 (file)
 // This file was generated by gir (https://github.com/gtk-rs/gir)
-// from gir-files (https://github.com/gtk-rs/gir-files)
+// from gir-files
 // DO NOT EDIT
 
-use gio;
-use glib;
+use crate::Repo;
 use glib::object::IsA;
 use glib::translate::*;
-use glib::GString;
-use ostree_sys;
 use std::fmt;
 use std::mem;
 use std::ptr;
-use Repo;
 
-glib_wrapper! {
-    pub struct RepoFile(Object<ostree_sys::OstreeRepoFile, ostree_sys::OstreeRepoFileClass, RepoFileClass>) @implements gio::File;
+glib::wrapper! {
+    #[doc(alias = "OstreeRepoFile")]
+    pub struct RepoFile(Object<ffi::OstreeRepoFile, ffi::OstreeRepoFileClass>) @implements gio::File;
 
     match fn {
-        get_type => || ostree_sys::ostree_repo_file_get_type(),
+        type_ => || ffi::ostree_repo_file_get_type(),
     }
 }
 
-pub const NONE_REPO_FILE: Option<&RepoFile> = None;
-
-pub trait RepoFileExt: 'static {
-    fn ensure_resolved(&self) -> Result<(), glib::Error>;
-
-    fn get_checksum(&self) -> Option<GString>;
-
-    fn get_repo(&self) -> Option<Repo>;
-
-    fn get_root(&self) -> Option<RepoFile>;
-
-    fn get_xattrs<P: IsA<gio::Cancellable>>(&self, cancellable: Option<&P>) -> Result<glib::Variant, glib::Error>;
-
-    fn tree_find_child(&self, name: &str) -> (i32, bool, glib::Variant);
-
-    fn tree_get_contents(&self) -> Option<glib::Variant>;
-
-    fn tree_get_contents_checksum(&self) -> Option<GString>;
-
-    fn tree_get_metadata(&self) -> Option<glib::Variant>;
-
-    fn tree_get_metadata_checksum(&self) -> Option<GString>;
-
-    fn tree_query_child<P: IsA<gio::Cancellable>>(&self, n: i32, attributes: &str, flags: gio::FileQueryInfoFlags, cancellable: Option<&P>) -> Result<gio::FileInfo, glib::Error>;
-
-    fn tree_set_metadata(&self, checksum: &str, metadata: &glib::Variant);
-}
-
-impl<O: IsA<RepoFile>> RepoFileExt for O {
-    fn ensure_resolved(&self) -> Result<(), glib::Error> {
+impl RepoFile {
+    #[doc(alias = "ostree_repo_file_ensure_resolved")]
+    pub fn ensure_resolved(&self) -> Result<(), glib::Error> {
         unsafe {
             let mut error = ptr::null_mut();
-            let _ = ostree_sys::ostree_repo_file_ensure_resolved(self.as_ref().to_glib_none().0, &mut error);
+            let _ = ffi::ostree_repo_file_ensure_resolved(self.to_glib_none().0, &mut error);
             if error.is_null() { Ok(()) } else { Err(from_glib_full(error)) }
         }
     }
 
-    fn get_checksum(&self) -> Option<GString> {
+    #[doc(alias = "ostree_repo_file_get_checksum")]
+    #[doc(alias = "get_checksum")]
+    pub fn checksum(&self) -> Option<glib::GString> {
         unsafe {
-            from_glib_none(ostree_sys::ostree_repo_file_get_checksum(self.as_ref().to_glib_none().0))
+            from_glib_none(ffi::ostree_repo_file_get_checksum(self.to_glib_none().0))
         }
     }
 
-    fn get_repo(&self) -> Option<Repo> {
+    #[doc(alias = "ostree_repo_file_get_repo")]
+    #[doc(alias = "get_repo")]
+    pub fn repo(&self) -> Option<Repo> {
         unsafe {
-            from_glib_none(ostree_sys::ostree_repo_file_get_repo(self.as_ref().to_glib_none().0))
+            from_glib_none(ffi::ostree_repo_file_get_repo(self.to_glib_none().0))
         }
     }
 
-    fn get_root(&self) -> Option<RepoFile> {
+    #[doc(alias = "ostree_repo_file_get_root")]
+    #[doc(alias = "get_root")]
+    pub fn root(&self) -> Option<RepoFile> {
         unsafe {
-            from_glib_none(ostree_sys::ostree_repo_file_get_root(self.as_ref().to_glib_none().0))
+            from_glib_none(ffi::ostree_repo_file_get_root(self.to_glib_none().0))
         }
     }
 
-    fn get_xattrs<P: IsA<gio::Cancellable>>(&self, cancellable: Option<&P>) -> Result<glib::Variant, glib::Error> {
+    #[doc(alias = "ostree_repo_file_get_xattrs")]
+    #[doc(alias = "get_xattrs")]
+    pub fn xattrs<P: IsA<gio::Cancellable>>(&self, cancellable: Option<&P>) -> Result<glib::Variant, glib::Error> {
         unsafe {
             let mut out_xattrs = ptr::null_mut();
             let mut error = ptr::null_mut();
-            let _ = ostree_sys::ostree_repo_file_get_xattrs(self.as_ref().to_glib_none().0, &mut out_xattrs, cancellable.map(|p| p.as_ref()).to_glib_none().0, &mut error);
+            let _ = ffi::ostree_repo_file_get_xattrs(self.to_glib_none().0, &mut out_xattrs, cancellable.map(|p| p.as_ref()).to_glib_none().0, &mut error);
             if error.is_null() { Ok(from_glib_full(out_xattrs)) } else { Err(from_glib_full(error)) }
         }
     }
 
-    fn tree_find_child(&self, name: &str) -> (i32, bool, glib::Variant) {
+    #[doc(alias = "ostree_repo_file_tree_find_child")]
+    pub fn tree_find_child(&self, name: &str) -> (i32, bool, glib::Variant) {
         unsafe {
             let mut is_dir = mem::MaybeUninit::uninit();
             let mut out_container = ptr::null_mut();
-            let ret = ostree_sys::ostree_repo_file_tree_find_child(self.as_ref().to_glib_none().0, name.to_glib_none().0, is_dir.as_mut_ptr(), &mut out_container);
+            let ret = ffi::ostree_repo_file_tree_find_child(self.to_glib_none().0, name.to_glib_none().0, is_dir.as_mut_ptr(), &mut out_container);
             let is_dir = is_dir.assume_init();
             (ret, from_glib(is_dir), from_glib_full(out_container))
         }
     }
 
-    fn tree_get_contents(&self) -> Option<glib::Variant> {
+    #[doc(alias = "ostree_repo_file_tree_get_contents")]
+    pub fn tree_get_contents(&self) -> Option<glib::Variant> {
         unsafe {
-            from_glib_full(ostree_sys::ostree_repo_file_tree_get_contents(self.as_ref().to_glib_none().0))
+            from_glib_full(ffi::ostree_repo_file_tree_get_contents(self.to_glib_none().0))
         }
     }
 
-    fn tree_get_contents_checksum(&self) -> Option<GString> {
+    #[doc(alias = "ostree_repo_file_tree_get_contents_checksum")]
+    pub fn tree_get_contents_checksum(&self) -> Option<glib::GString> {
         unsafe {
-            from_glib_none(ostree_sys::ostree_repo_file_tree_get_contents_checksum(self.as_ref().to_glib_none().0))
+            from_glib_none(ffi::ostree_repo_file_tree_get_contents_checksum(self.to_glib_none().0))
         }
     }
 
-    fn tree_get_metadata(&self) -> Option<glib::Variant> {
+    #[doc(alias = "ostree_repo_file_tree_get_metadata")]
+    pub fn tree_get_metadata(&self) -> Option<glib::Variant> {
         unsafe {
-            from_glib_full(ostree_sys::ostree_repo_file_tree_get_metadata(self.as_ref().to_glib_none().0))
+            from_glib_full(ffi::ostree_repo_file_tree_get_metadata(self.to_glib_none().0))
         }
     }
 
-    fn tree_get_metadata_checksum(&self) -> Option<GString> {
+    #[doc(alias = "ostree_repo_file_tree_get_metadata_checksum")]
+    pub fn tree_get_metadata_checksum(&self) -> Option<glib::GString> {
         unsafe {
-            from_glib_none(ostree_sys::ostree_repo_file_tree_get_metadata_checksum(self.as_ref().to_glib_none().0))
+            from_glib_none(ffi::ostree_repo_file_tree_get_metadata_checksum(self.to_glib_none().0))
         }
     }
 
-    fn tree_query_child<P: IsA<gio::Cancellable>>(&self, n: i32, attributes: &str, flags: gio::FileQueryInfoFlags, cancellable: Option<&P>) -> Result<gio::FileInfo, glib::Error> {
+    #[doc(alias = "ostree_repo_file_tree_query_child")]
+    pub fn tree_query_child<P: IsA<gio::Cancellable>>(&self, n: i32, attributes: &str, flags: gio::FileQueryInfoFlags, cancellable: Option<&P>) -> Result<gio::FileInfo, glib::Error> {
         unsafe {
             let mut out_info = ptr::null_mut();
             let mut error = ptr::null_mut();
-            let _ = ostree_sys::ostree_repo_file_tree_query_child(self.as_ref().to_glib_none().0, n, attributes.to_glib_none().0, flags.to_glib(), &mut out_info, cancellable.map(|p| p.as_ref()).to_glib_none().0, &mut error);
+            let _ = ffi::ostree_repo_file_tree_query_child(self.to_glib_none().0, n, attributes.to_glib_none().0, flags.into_glib(), &mut out_info, cancellable.map(|p| p.as_ref()).to_glib_none().0, &mut error);
             if error.is_null() { Ok(from_glib_full(out_info)) } else { Err(from_glib_full(error)) }
         }
     }
 
-    fn tree_set_metadata(&self, checksum: &str, metadata: &glib::Variant) {
+    #[doc(alias = "ostree_repo_file_tree_set_metadata")]
+    pub fn tree_set_metadata(&self, checksum: &str, metadata: &glib::Variant) {
         unsafe {
-            ostree_sys::ostree_repo_file_tree_set_metadata(self.as_ref().to_glib_none().0, checksum.to_glib_none().0, metadata.to_glib_none().0);
+            ffi::ostree_repo_file_tree_set_metadata(self.to_glib_none().0, checksum.to_glib_none().0, metadata.to_glib_none().0);
         }
     }
 }
 
 impl fmt::Display for RepoFile {
     fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        write!(f, "RepoFile")
+        f.write_str("RepoFile")
     }
 }
index b2e4ea3da5cf59a3af46101358cc5ec718a7831a..ed5e1f86fe89c59f93e6627dc282d15b3dca5c21 100644 (file)
@@ -1,25 +1,19 @@
 // This file was generated by gir (https://github.com/gtk-rs/gir)
-// from gir-files (https://github.com/gtk-rs/gir-files)
+// from gir-files
 // DO NOT EDIT
 
-#[cfg(any(feature = "v2018_6", feature = "dox"))]
-use gio;
-#[cfg(any(feature = "v2018_6", feature = "dox"))]
-use glib;
+use crate::RepoFinderResult;
 use glib::object::IsA;
 use glib::translate::*;
-use ostree_sys;
 use std::fmt;
-#[cfg(any(feature = "v2018_6", feature = "dox"))]
 use std::ptr;
-#[cfg(any(feature = "v2018_6", feature = "dox"))]
-use RepoFinderResult;
 
-glib_wrapper! {
-    pub struct RepoFinder(Interface<ostree_sys::OstreeRepoFinder>);
+glib::wrapper! {
+    #[doc(alias = "OstreeRepoFinder")]
+    pub struct RepoFinder(Interface<ffi::OstreeRepoFinder, ffi::OstreeRepoFinderInterface>);
 
     match fn {
-        get_type => || ostree_sys::ostree_repo_finder_get_type(),
+        type_ => || ffi::ostree_repo_finder_get_type(),
     }
 }
 
@@ -33,6 +27,6 @@ impl<O: IsA<RepoFinder>> RepoFinderExt for O {}
 
 impl fmt::Display for RepoFinder {
     fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        write!(f, "RepoFinder")
+        f.write_str("RepoFinder")
     }
 }
index af9e709057feffa58cb4a24c2df47978b89c9423..8910a437814bf3c7f3499659716ff6bb9342669f 100644 (file)
@@ -1,64 +1,48 @@
 // This file was generated by gir (https://github.com/gtk-rs/gir)
-// from gir-files (https://github.com/gtk-rs/gir-files)
+// from gir-files
 // DO NOT EDIT
 
-#[cfg(any(feature = "v2018_6", feature = "dox"))]
-use glib;
-use glib::object::IsA;
+use crate::RepoFinder;
 use glib::translate::*;
-use ostree_sys;
 use std::fmt;
-#[cfg(any(feature = "v2018_6", feature = "dox"))]
 use std::ptr;
-use RepoFinder;
 
-glib_wrapper! {
-    pub struct RepoFinderAvahi(Object<ostree_sys::OstreeRepoFinderAvahi, ostree_sys::OstreeRepoFinderAvahiClass, RepoFinderAvahiClass>) @implements RepoFinder;
+glib::wrapper! {
+    #[doc(alias = "OstreeRepoFinderAvahi")]
+    pub struct RepoFinderAvahi(Object<ffi::OstreeRepoFinderAvahi, ffi::OstreeRepoFinderAvahiClass>) @implements RepoFinder;
 
     match fn {
-        get_type => || ostree_sys::ostree_repo_finder_avahi_get_type(),
+        type_ => || ffi::ostree_repo_finder_avahi_get_type(),
     }
 }
 
 impl RepoFinderAvahi {
-    #[cfg(any(feature = "v2018_6", feature = "dox"))]
+    #[doc(alias = "ostree_repo_finder_avahi_new")]
     pub fn new(context: Option<&glib::MainContext>) -> RepoFinderAvahi {
         unsafe {
-            from_glib_full(ostree_sys::ostree_repo_finder_avahi_new(context.to_glib_none().0))
+            from_glib_full(ffi::ostree_repo_finder_avahi_new(context.to_glib_none().0))
         }
     }
-}
-
-pub const NONE_REPO_FINDER_AVAHI: Option<&RepoFinderAvahi> = None;
-
-pub trait RepoFinderAvahiExt: 'static {
-    #[cfg(any(feature = "v2018_6", feature = "dox"))]
-    fn start(&self) -> Result<(), glib::Error>;
-
-    #[cfg(any(feature = "v2018_6", feature = "dox"))]
-    fn stop(&self);
-}
 
-impl<O: IsA<RepoFinderAvahi>> RepoFinderAvahiExt for O {
-    #[cfg(any(feature = "v2018_6", feature = "dox"))]
-    fn start(&self) -> Result<(), glib::Error> {
+    #[doc(alias = "ostree_repo_finder_avahi_start")]
+    pub fn start(&self) -> Result<(), glib::Error> {
         unsafe {
             let mut error = ptr::null_mut();
-            let _ = ostree_sys::ostree_repo_finder_avahi_start(self.as_ref().to_glib_none().0, &mut error);
+            let _ = ffi::ostree_repo_finder_avahi_start(self.to_glib_none().0, &mut error);
             if error.is_null() { Ok(()) } else { Err(from_glib_full(error)) }
         }
     }
 
-    #[cfg(any(feature = "v2018_6", feature = "dox"))]
-    fn stop(&self) {
+    #[doc(alias = "ostree_repo_finder_avahi_stop")]
+    pub fn stop(&self) {
         unsafe {
-            ostree_sys::ostree_repo_finder_avahi_stop(self.as_ref().to_glib_none().0);
+            ffi::ostree_repo_finder_avahi_stop(self.to_glib_none().0);
         }
     }
 }
 
 impl fmt::Display for RepoFinderAvahi {
     fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        write!(f, "RepoFinderAvahi")
+        f.write_str("RepoFinderAvahi")
     }
 }
index 17a78e8cafb59e750c081cd692ac09912458895c..2b76d99be3c62138e5f3b94a014a87c6581b5e3f 100644 (file)
@@ -1,40 +1,39 @@
 // This file was generated by gir (https://github.com/gtk-rs/gir)
-// from gir-files (https://github.com/gtk-rs/gir-files)
+// from gir-files
 // DO NOT EDIT
 
+use crate::RepoFinder;
 use glib::translate::*;
-use ostree_sys;
 use std::fmt;
-use RepoFinder;
 
-glib_wrapper! {
-    pub struct RepoFinderConfig(Object<ostree_sys::OstreeRepoFinderConfig, ostree_sys::OstreeRepoFinderConfigClass, RepoFinderConfigClass>) @implements RepoFinder;
+glib::wrapper! {
+    #[doc(alias = "OstreeRepoFinderConfig")]
+    pub struct RepoFinderConfig(Object<ffi::OstreeRepoFinderConfig, ffi::OstreeRepoFinderConfigClass>) @implements RepoFinder;
 
     match fn {
-        get_type => || ostree_sys::ostree_repo_finder_config_get_type(),
+        type_ => || ffi::ostree_repo_finder_config_get_type(),
     }
 }
 
 impl RepoFinderConfig {
-    #[cfg(any(feature = "v2018_6", feature = "dox"))]
+    #[doc(alias = "ostree_repo_finder_config_new")]
     pub fn new() -> RepoFinderConfig {
         unsafe {
-            from_glib_full(ostree_sys::ostree_repo_finder_config_new())
+            from_glib_full(ffi::ostree_repo_finder_config_new())
         }
     }
 }
 
 #[cfg(any(feature = "v2018_6", feature = "dox"))]
+#[cfg_attr(feature = "dox", doc(cfg(feature = "v2018_6")))]
 impl Default for RepoFinderConfig {
     fn default() -> Self {
         Self::new()
     }
 }
 
-pub const NONE_REPO_FINDER_CONFIG: Option<&RepoFinderConfig> = None;
-
 impl fmt::Display for RepoFinderConfig {
     fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        write!(f, "RepoFinderConfig")
+        f.write_str("RepoFinderConfig")
     }
 }
index 072c2a7ca5c062b64f90a852d36220949c35c51e..eda91f38509cd69c48c200554c89988867129eaa 100644 (file)
@@ -1,51 +1,37 @@
 // This file was generated by gir (https://github.com/gtk-rs/gir)
-// from gir-files (https://github.com/gtk-rs/gir-files)
+// from gir-files
 // DO NOT EDIT
 
-#[cfg(any(feature = "v2018_6", feature = "dox"))]
-use gio;
+use crate::RepoFinder;
 use glib::object::IsA;
+use glib::object::ObjectType as ObjectType_;
 use glib::translate::*;
-#[cfg(any(feature = "v2018_6", feature = "dox"))]
 use glib::StaticType;
-#[cfg(any(feature = "v2018_6", feature = "dox"))]
-use glib::Value;
-#[cfg(any(feature = "v2018_6", feature = "dox"))]
-use gobject_sys;
-use ostree_sys;
 use std::fmt;
-use RepoFinder;
 
-glib_wrapper! {
-    pub struct RepoFinderMount(Object<ostree_sys::OstreeRepoFinderMount, ostree_sys::OstreeRepoFinderMountClass, RepoFinderMountClass>) @implements RepoFinder;
+glib::wrapper! {
+    #[doc(alias = "OstreeRepoFinderMount")]
+    pub struct RepoFinderMount(Object<ffi::OstreeRepoFinderMount, ffi::OstreeRepoFinderMountClass>) @implements RepoFinder;
 
     match fn {
-        get_type => || ostree_sys::ostree_repo_finder_mount_get_type(),
+        type_ => || ffi::ostree_repo_finder_mount_get_type(),
     }
 }
 
 impl RepoFinderMount {
-    #[cfg(any(feature = "v2018_6", feature = "dox"))]
+    #[doc(alias = "ostree_repo_finder_mount_new")]
     pub fn new<P: IsA<gio::VolumeMonitor>>(monitor: Option<&P>) -> RepoFinderMount {
         unsafe {
-            from_glib_full(ostree_sys::ostree_repo_finder_mount_new(monitor.map(|p| p.as_ref()).to_glib_none().0))
+            from_glib_full(ffi::ostree_repo_finder_mount_new(monitor.map(|p| p.as_ref()).to_glib_none().0))
         }
     }
-}
-
-pub const NONE_REPO_FINDER_MOUNT: Option<&RepoFinderMount> = None;
-
-pub trait RepoFinderMountExt: 'static {
-    #[cfg(any(feature = "v2018_6", feature = "dox"))]
-    fn get_property_monitor(&self) -> Option<gio::VolumeMonitor>;
-}
 
-impl<O: IsA<RepoFinderMount>> RepoFinderMountExt for O {
     #[cfg(any(feature = "v2018_6", feature = "dox"))]
-    fn get_property_monitor(&self) -> Option<gio::VolumeMonitor> {
+    #[cfg_attr(feature = "dox", doc(cfg(feature = "v2018_6")))]
+    pub fn monitor(&self) -> Option<gio::VolumeMonitor> {
         unsafe {
-            let mut value = Value::from_type(<gio::VolumeMonitor as StaticType>::static_type());
-            gobject_sys::g_object_get_property(self.to_glib_none().0 as *mut gobject_sys::GObject, b"monitor\0".as_ptr() as *const _, value.to_glib_none_mut().0);
+            let mut value = glib::Value::from_type(<gio::VolumeMonitor as StaticType>::static_type());
+            glib::gobject_ffi::g_object_get_property(self.as_ptr() as *mut glib::gobject_ffi::GObject, b"monitor\0".as_ptr() as *const _, value.to_glib_none_mut().0);
             value.get().expect("Return Value for property `monitor` getter")
         }
     }
@@ -53,6 +39,6 @@ impl<O: IsA<RepoFinderMount>> RepoFinderMountExt for O {
 
 impl fmt::Display for RepoFinderMount {
     fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        write!(f, "RepoFinderMount")
+        f.write_str("RepoFinderMount")
     }
 }
index 5bf31e3c151f35c8f1498d9c457cd9ae3a005d0a..d504c180daf00e5212740a4d6566e13c927fb58b 100644 (file)
@@ -1,55 +1,46 @@
 // This file was generated by gir (https://github.com/gtk-rs/gir)
-// from gir-files (https://github.com/gtk-rs/gir-files)
+// from gir-files
 // DO NOT EDIT
 
-use glib::object::IsA;
+use crate::RepoFinder;
 use glib::translate::*;
-use ostree_sys;
 use std::fmt;
-use RepoFinder;
 
-glib_wrapper! {
-    pub struct RepoFinderOverride(Object<ostree_sys::OstreeRepoFinderOverride, ostree_sys::OstreeRepoFinderOverrideClass, RepoFinderOverrideClass>) @implements RepoFinder;
+glib::wrapper! {
+    #[doc(alias = "OstreeRepoFinderOverride")]
+    pub struct RepoFinderOverride(Object<ffi::OstreeRepoFinderOverride, ffi::OstreeRepoFinderOverrideClass>) @implements RepoFinder;
 
     match fn {
-        get_type => || ostree_sys::ostree_repo_finder_override_get_type(),
+        type_ => || ffi::ostree_repo_finder_override_get_type(),
     }
 }
 
 impl RepoFinderOverride {
-    #[cfg(any(feature = "v2018_6", feature = "dox"))]
+    #[doc(alias = "ostree_repo_finder_override_new")]
     pub fn new() -> RepoFinderOverride {
         unsafe {
-            from_glib_full(ostree_sys::ostree_repo_finder_override_new())
+            from_glib_full(ffi::ostree_repo_finder_override_new())
+        }
+    }
+
+    #[doc(alias = "ostree_repo_finder_override_add_uri")]
+    pub fn add_uri(&self, uri: &str) {
+        unsafe {
+            ffi::ostree_repo_finder_override_add_uri(self.to_glib_none().0, uri.to_glib_none().0);
         }
     }
 }
 
 #[cfg(any(feature = "v2018_6", feature = "dox"))]
+#[cfg_attr(feature = "dox", doc(cfg(feature = "v2018_6")))]
 impl Default for RepoFinderOverride {
     fn default() -> Self {
         Self::new()
     }
 }
 
-pub const NONE_REPO_FINDER_OVERRIDE: Option<&RepoFinderOverride> = None;
-
-pub trait RepoFinderOverrideExt: 'static {
-    #[cfg(any(feature = "v2018_6", feature = "dox"))]
-    fn add_uri(&self, uri: &str);
-}
-
-impl<O: IsA<RepoFinderOverride>> RepoFinderOverrideExt for O {
-    #[cfg(any(feature = "v2018_6", feature = "dox"))]
-    fn add_uri(&self, uri: &str) {
-        unsafe {
-            ostree_sys::ostree_repo_finder_override_add_uri(self.as_ref().to_glib_none().0, uri.to_glib_none().0);
-        }
-    }
-}
-
 impl fmt::Display for RepoFinderOverride {
     fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        write!(f, "RepoFinderOverride")
+        f.write_str("RepoFinderOverride")
     }
 }
index e8ece65a5fa5fb3c95e164a785ab6db82592809a..702ec52c924d89f5bdd3f37e3ca8886e0038e0f8 100644 (file)
@@ -1,34 +1,31 @@
 // This file was generated by gir (https://github.com/gtk-rs/gir)
-// from gir-files (https://github.com/gtk-rs/gir-files)
+// from gir-files
 // DO NOT EDIT
 
-#[cfg(any(feature = "v2018_6", feature = "dox"))]
-use glib::translate::*;
-use gobject_sys;
-use ostree_sys;
 use std::cmp;
+use glib::translate::*;
 
-glib_wrapper! {
+glib::wrapper! {
     #[derive(Debug, Hash)]
-    pub struct RepoFinderResult(Boxed<ostree_sys::OstreeRepoFinderResult>);
+    pub struct RepoFinderResult(Boxed<ffi::OstreeRepoFinderResult>);
 
     match fn {
-        copy => |ptr| gobject_sys::g_boxed_copy(ostree_sys::ostree_repo_finder_result_get_type(), ptr as *mut _) as *mut ostree_sys::OstreeRepoFinderResult,
-        free => |ptr| gobject_sys::g_boxed_free(ostree_sys::ostree_repo_finder_result_get_type(), ptr as *mut _),
-        get_type => || ostree_sys::ostree_repo_finder_result_get_type(),
+        copy => |ptr| glib::gobject_ffi::g_boxed_copy(ffi::ostree_repo_finder_result_get_type(), ptr as *mut _) as *mut ffi::OstreeRepoFinderResult,
+        free => |ptr| glib::gobject_ffi::g_boxed_free(ffi::ostree_repo_finder_result_get_type(), ptr as *mut _),
+        type_ => || ffi::ostree_repo_finder_result_get_type(),
     }
 }
 
 impl RepoFinderResult {
-    //#[cfg(any(feature = "v2018_6", feature = "dox"))]
+    //#[doc(alias = "ostree_repo_finder_result_new")]
     //pub fn new<P: IsA<RepoFinder>>(remote: &Remote, finder: &P, priority: i32, ref_to_checksum: /*Unknown conversion*//*Unimplemented*/HashTable TypeId { ns_id: 1, id: 0 }/TypeId { ns_id: 0, id: 28 }, ref_to_timestamp: /*Unknown conversion*//*Unimplemented*/HashTable TypeId { ns_id: 1, id: 0 }/TypeId { ns_id: 0, id: 9 }, summary_last_modified: u64) -> RepoFinderResult {
-    //    unsafe { TODO: call ostree_sys:ostree_repo_finder_result_new() }
+    //    unsafe { TODO: call ffi:ostree_repo_finder_result_new() }
     //}
 
-    #[cfg(any(feature = "v2018_6", feature = "dox"))]
+    #[doc(alias = "ostree_repo_finder_result_compare")]
     fn compare(&self, b: &RepoFinderResult) -> i32 {
         unsafe {
-            ostree_sys::ostree_repo_finder_result_compare(self.to_glib_none().0, b.to_glib_none().0)
+            ffi::ostree_repo_finder_result_compare(self.to_glib_none().0, b.to_glib_none().0)
         }
     }
 }
index b81cea8adc4190b65f6e8ca9e42b847cb6dbbf97..029e078569c87eae0c69e838a17fa33031bd9b81 100644 (file)
 // This file was generated by gir (https://github.com/gtk-rs/gir)
-// from gir-files (https://github.com/gtk-rs/gir-files)
+// from gir-files
 // DO NOT EDIT
 
-use gio;
-use glib;
+use crate::SePolicyRestoreconFlags;
 use glib::object::IsA;
 use glib::object::ObjectType as ObjectType_;
 use glib::translate::*;
-use glib::GString;
 use glib::StaticType;
-use glib::Value;
-use gobject_sys;
-use ostree_sys;
 use std::fmt;
 use std::ptr;
-use SePolicyRestoreconFlags;
 
-glib_wrapper! {
-    pub struct SePolicy(Object<ostree_sys::OstreeSePolicy, SePolicyClass>);
+glib::wrapper! {
+    #[doc(alias = "OstreeSePolicy")]
+    pub struct SePolicy(Object<ffi::OstreeSePolicy>);
 
     match fn {
-        get_type => || ostree_sys::ostree_sepolicy_get_type(),
+        type_ => || ffi::ostree_sepolicy_get_type(),
     }
 }
 
 impl SePolicy {
+    #[doc(alias = "ostree_sepolicy_new")]
     pub fn new<P: IsA<gio::File>, Q: IsA<gio::Cancellable>>(path: &P, cancellable: Option<&Q>) -> Result<SePolicy, glib::Error> {
         unsafe {
             let mut error = ptr::null_mut();
-            let ret = ostree_sys::ostree_sepolicy_new(path.as_ref().to_glib_none().0, cancellable.map(|p| p.as_ref()).to_glib_none().0, &mut error);
+            let ret = ffi::ostree_sepolicy_new(path.as_ref().to_glib_none().0, cancellable.map(|p| p.as_ref()).to_glib_none().0, &mut error);
             if error.is_null() { Ok(from_glib_full(ret)) } else { Err(from_glib_full(error)) }
         }
     }
 
     #[cfg(any(feature = "v2017_4", feature = "dox"))]
+    #[cfg_attr(feature = "dox", doc(cfg(feature = "v2017_4")))]
+    #[doc(alias = "ostree_sepolicy_new_at")]
     pub fn new_at<P: IsA<gio::Cancellable>>(rootfs_dfd: i32, cancellable: Option<&P>) -> Result<SePolicy, glib::Error> {
         unsafe {
             let mut error = ptr::null_mut();
-            let ret = ostree_sys::ostree_sepolicy_new_at(rootfs_dfd, cancellable.map(|p| p.as_ref()).to_glib_none().0, &mut error);
+            let ret = ffi::ostree_sepolicy_new_at(rootfs_dfd, cancellable.map(|p| p.as_ref()).to_glib_none().0, &mut error);
             if error.is_null() { Ok(from_glib_full(ret)) } else { Err(from_glib_full(error)) }
         }
     }
 
     #[cfg(any(feature = "v2016_5", feature = "dox"))]
-    pub fn get_csum(&self) -> Option<GString> {
+    #[cfg_attr(feature = "dox", doc(cfg(feature = "v2016_5")))]
+    #[doc(alias = "ostree_sepolicy_get_csum")]
+    #[doc(alias = "get_csum")]
+    pub fn csum(&self) -> Option<glib::GString> {
         unsafe {
-            from_glib_none(ostree_sys::ostree_sepolicy_get_csum(self.to_glib_none().0))
+            from_glib_none(ffi::ostree_sepolicy_get_csum(self.to_glib_none().0))
         }
     }
 
-    pub fn get_label<P: IsA<gio::Cancellable>>(&self, relpath: &str, unix_mode: u32, cancellable: Option<&P>) -> Result<GString, glib::Error> {
+    #[doc(alias = "ostree_sepolicy_get_label")]
+    #[doc(alias = "get_label")]
+    pub fn label<P: IsA<gio::Cancellable>>(&self, relpath: &str, unix_mode: u32, cancellable: Option<&P>) -> Result<glib::GString, glib::Error> {
         unsafe {
             let mut out_label = ptr::null_mut();
             let mut error = ptr::null_mut();
-            let _ = ostree_sys::ostree_sepolicy_get_label(self.to_glib_none().0, relpath.to_glib_none().0, unix_mode, &mut out_label, cancellable.map(|p| p.as_ref()).to_glib_none().0, &mut error);
+            let _ = ffi::ostree_sepolicy_get_label(self.to_glib_none().0, relpath.to_glib_none().0, unix_mode, &mut out_label, cancellable.map(|p| p.as_ref()).to_glib_none().0, &mut error);
             if error.is_null() { Ok(from_glib_full(out_label)) } else { Err(from_glib_full(error)) }
         }
     }
 
-    pub fn get_name(&self) -> Option<GString> {
+    #[doc(alias = "ostree_sepolicy_get_name")]
+    #[doc(alias = "get_name")]
+    pub fn name(&self) -> Option<glib::GString> {
         unsafe {
-            from_glib_none(ostree_sys::ostree_sepolicy_get_name(self.to_glib_none().0))
+            from_glib_none(ffi::ostree_sepolicy_get_name(self.to_glib_none().0))
         }
     }
 
-    pub fn get_path(&self) -> Option<gio::File> {
+    #[doc(alias = "ostree_sepolicy_get_path")]
+    #[doc(alias = "get_path")]
+    pub fn path(&self) -> Option<gio::File> {
         unsafe {
-            from_glib_none(ostree_sys::ostree_sepolicy_get_path(self.to_glib_none().0))
+            from_glib_none(ffi::ostree_sepolicy_get_path(self.to_glib_none().0))
         }
     }
 
-    pub fn restorecon<P: IsA<gio::File>, Q: IsA<gio::Cancellable>>(&self, path: &str, info: Option<&gio::FileInfo>, target: &P, flags: SePolicyRestoreconFlags, cancellable: Option<&Q>) -> Result<GString, glib::Error> {
+    #[doc(alias = "ostree_sepolicy_restorecon")]
+    pub fn restorecon<P: IsA<gio::File>, Q: IsA<gio::Cancellable>>(&self, path: &str, info: Option<&gio::FileInfo>, target: &P, flags: SePolicyRestoreconFlags, cancellable: Option<&Q>) -> Result<glib::GString, glib::Error> {
         unsafe {
             let mut out_new_label = ptr::null_mut();
             let mut error = ptr::null_mut();
-            let _ = ostree_sys::ostree_sepolicy_restorecon(self.to_glib_none().0, path.to_glib_none().0, info.to_glib_none().0, target.as_ref().to_glib_none().0, flags.to_glib(), &mut out_new_label, cancellable.map(|p| p.as_ref()).to_glib_none().0, &mut error);
+            let _ = ffi::ostree_sepolicy_restorecon(self.to_glib_none().0, path.to_glib_none().0, info.to_glib_none().0, target.as_ref().to_glib_none().0, flags.into_glib(), &mut out_new_label, cancellable.map(|p| p.as_ref()).to_glib_none().0, &mut error);
             if error.is_null() { Ok(from_glib_full(out_new_label)) } else { Err(from_glib_full(error)) }
         }
     }
 
+    #[doc(alias = "ostree_sepolicy_setfscreatecon")]
     pub fn setfscreatecon(&self, path: &str, mode: u32) -> Result<(), glib::Error> {
         unsafe {
             let mut error = ptr::null_mut();
-            let _ = ostree_sys::ostree_sepolicy_setfscreatecon(self.to_glib_none().0, path.to_glib_none().0, mode, &mut error);
+            let _ = ffi::ostree_sepolicy_setfscreatecon(self.to_glib_none().0, path.to_glib_none().0, mode, &mut error);
             if error.is_null() { Ok(()) } else { Err(from_glib_full(error)) }
         }
     }
 
-    pub fn get_property_rootfs_dfd(&self) -> i32 {
+    #[doc(alias = "rootfs-dfd")]
+    pub fn rootfs_dfd(&self) -> i32 {
         unsafe {
-            let mut value = Value::from_type(<i32 as StaticType>::static_type());
-            gobject_sys::g_object_get_property(self.as_ptr() as *mut gobject_sys::GObject, b"rootfs-dfd\0".as_ptr() as *const _, value.to_glib_none_mut().0);
-            value.get().expect("Return Value for property `rootfs-dfd` getter").unwrap()
+            let mut value = glib::Value::from_type(<i32 as StaticType>::static_type());
+            glib::gobject_ffi::g_object_get_property(self.as_ptr() as *mut glib::gobject_ffi::GObject, b"rootfs-dfd\0".as_ptr() as *const _, value.to_glib_none_mut().0);
+            value.get().expect("Return Value for property `rootfs-dfd` getter")
         }
     }
 }
 
 impl fmt::Display for SePolicy {
     fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        write!(f, "SePolicy")
+        f.write_str("SePolicy")
     }
 }
index 2f71572010a0069ec755e662994c983b92685171..7a449245e050203e4a562ab315d4c9d21825d862 100644 (file)
@@ -1,43 +1,37 @@
 // This file was generated by gir (https://github.com/gtk-rs/gir)
-// from gir-files (https://github.com/gtk-rs/gir-files)
+// from gir-files
 // DO NOT EDIT
 
-#[cfg(any(feature = "v2020_2", feature = "dox"))]
-use gio;
-#[cfg(any(feature = "v2020_2", feature = "dox"))]
-use glib;
+use crate::Repo;
 use glib::object::IsA;
 use glib::translate::*;
-#[cfg(any(feature = "v2020_2", feature = "dox"))]
-use glib::GString;
-use ostree_sys;
 use std::fmt;
-#[cfg(any(feature = "v2020_2", feature = "dox"))]
 use std::ptr;
-#[cfg(any(feature = "v2020_2", feature = "dox"))]
-use Repo;
 
-glib_wrapper! {
-    pub struct Sign(Interface<ostree_sys::OstreeSign>);
+glib::wrapper! {
+    #[doc(alias = "OstreeSign")]
+    pub struct Sign(Interface<ffi::OstreeSign, ffi::OstreeSignInterface>);
 
     match fn {
-        get_type => || ostree_sys::ostree_sign_get_type(),
+        type_ => || ffi::ostree_sign_get_type(),
     }
 }
 
 impl Sign {
-    #[cfg(any(feature = "v2020_2", feature = "dox"))]
-    pub fn get_all() -> Vec<Sign> {
+    #[doc(alias = "ostree_sign_get_all")]
+    #[doc(alias = "get_all")]
+    pub fn all() -> Vec<Sign> {
         unsafe {
-            FromGlibPtrContainer::from_glib_full(ostree_sys::ostree_sign_get_all())
+            FromGlibPtrContainer::from_glib_full(ffi::ostree_sign_get_all())
         }
     }
 
-    #[cfg(any(feature = "v2020_2", feature = "dox"))]
-    pub fn get_by_name(name: &str) -> Result<Sign, glib::Error> {
+    #[doc(alias = "ostree_sign_get_by_name")]
+    #[doc(alias = "get_by_name")]
+    pub fn by_name(name: &str) -> Result<Sign, glib::Error> {
         unsafe {
             let mut error = ptr::null_mut();
-            let ret = ostree_sys::ostree_sign_get_by_name(name.to_glib_none().0, &mut error);
+            let ret = ffi::ostree_sign_get_by_name(name.to_glib_none().0, &mut error);
             if error.is_null() { Ok(from_glib_full(ret)) } else { Err(from_glib_full(error)) }
         }
     }
@@ -46,157 +40,145 @@ impl Sign {
 pub const NONE_SIGN: Option<&Sign> = None;
 
 pub trait SignExt: 'static {
-    #[cfg(any(feature = "v2020_2", feature = "dox"))]
+    #[doc(alias = "ostree_sign_add_pk")]
     fn add_pk(&self, public_key: &glib::Variant) -> Result<(), glib::Error>;
 
-    #[cfg(any(feature = "v2020_2", feature = "dox"))]
+    #[doc(alias = "ostree_sign_clear_keys")]
     fn clear_keys(&self) -> Result<(), glib::Error>;
 
-    #[cfg(any(feature = "v2020_2", feature = "dox"))]
+    #[doc(alias = "ostree_sign_commit")]
     fn commit<P: IsA<gio::Cancellable>>(&self, repo: &Repo, commit_checksum: &str, cancellable: Option<&P>) -> Result<(), glib::Error>;
 
-    #[cfg(any(feature = "v2020_2", feature = "dox"))]
-    fn commit_verify<P: IsA<gio::Cancellable>>(&self, repo: &Repo, commit_checksum: &str, cancellable: Option<&P>) -> Result<Option<GString>, glib::Error>;
+    #[doc(alias = "ostree_sign_commit_verify")]
+    fn commit_verify<P: IsA<gio::Cancellable>>(&self, repo: &Repo, commit_checksum: &str, cancellable: Option<&P>) -> Result<Option<glib::GString>, glib::Error>;
 
-    #[cfg(any(feature = "v2020_2", feature = "dox"))]
+    #[doc(alias = "ostree_sign_data")]
     fn data<P: IsA<gio::Cancellable>>(&self, data: &glib::Bytes, cancellable: Option<&P>) -> Result<glib::Bytes, glib::Error>;
 
-    #[cfg(any(feature = "v2020_2", feature = "dox"))]
-    fn data_verify(&self, data: &glib::Bytes, signatures: &glib::Variant) -> Result<Option<GString>, glib::Error>;
+    #[doc(alias = "ostree_sign_data_verify")]
+    fn data_verify(&self, data: &glib::Bytes, signatures: &glib::Variant) -> Result<Option<glib::GString>, glib::Error>;
 
-    #[cfg(any(feature = "v2020_2", feature = "dox"))]
-    fn get_name(&self) -> Option<GString>;
+    #[doc(alias = "ostree_sign_get_name")]
+    #[doc(alias = "get_name")]
+    fn name(&self) -> Option<glib::GString>;
 
-    #[cfg(any(feature = "v2020_2", feature = "dox"))]
+    #[doc(alias = "ostree_sign_load_pk")]
     fn load_pk(&self, options: &glib::Variant) -> Result<(), glib::Error>;
 
-    #[cfg(any(feature = "v2020_2", feature = "dox"))]
-    fn metadata_format(&self) -> Option<GString>;
+    #[doc(alias = "ostree_sign_metadata_format")]
+    fn metadata_format(&self) -> Option<glib::GString>;
 
-    #[cfg(any(feature = "v2020_2", feature = "dox"))]
-    fn metadata_key(&self) -> Option<GString>;
+    #[doc(alias = "ostree_sign_metadata_key")]
+    fn metadata_key(&self) -> Option<glib::GString>;
 
-    #[cfg(any(feature = "v2020_2", feature = "dox"))]
+    #[doc(alias = "ostree_sign_set_pk")]
     fn set_pk(&self, public_key: &glib::Variant) -> Result<(), glib::Error>;
 
-    #[cfg(any(feature = "v2020_2", feature = "dox"))]
+    #[doc(alias = "ostree_sign_set_sk")]
     fn set_sk(&self, secret_key: &glib::Variant) -> Result<(), glib::Error>;
 
-    #[cfg(any(feature = "v2020_2", feature = "dox"))]
+    #[doc(alias = "ostree_sign_summary")]
     fn summary<P: IsA<gio::Cancellable>>(&self, repo: &Repo, keys: &glib::Variant, cancellable: Option<&P>) -> Result<(), glib::Error>;
 }
 
 impl<O: IsA<Sign>> SignExt for O {
-    #[cfg(any(feature = "v2020_2", feature = "dox"))]
     fn add_pk(&self, public_key: &glib::Variant) -> Result<(), glib::Error> {
         unsafe {
             let mut error = ptr::null_mut();
-            let _ = ostree_sys::ostree_sign_add_pk(self.as_ref().to_glib_none().0, public_key.to_glib_none().0, &mut error);
+            let _ = ffi::ostree_sign_add_pk(self.as_ref().to_glib_none().0, public_key.to_glib_none().0, &mut error);
             if error.is_null() { Ok(()) } else { Err(from_glib_full(error)) }
         }
     }
 
-    #[cfg(any(feature = "v2020_2", feature = "dox"))]
     fn clear_keys(&self) -> Result<(), glib::Error> {
         unsafe {
             let mut error = ptr::null_mut();
-            let _ = ostree_sys::ostree_sign_clear_keys(self.as_ref().to_glib_none().0, &mut error);
+            let _ = ffi::ostree_sign_clear_keys(self.as_ref().to_glib_none().0, &mut error);
             if error.is_null() { Ok(()) } else { Err(from_glib_full(error)) }
         }
     }
 
-    #[cfg(any(feature = "v2020_2", feature = "dox"))]
     fn commit<P: IsA<gio::Cancellable>>(&self, repo: &Repo, commit_checksum: &str, cancellable: Option<&P>) -> Result<(), glib::Error> {
         unsafe {
             let mut error = ptr::null_mut();
-            let _ = ostree_sys::ostree_sign_commit(self.as_ref().to_glib_none().0, repo.to_glib_none().0, commit_checksum.to_glib_none().0, cancellable.map(|p| p.as_ref()).to_glib_none().0, &mut error);
+            let _ = ffi::ostree_sign_commit(self.as_ref().to_glib_none().0, repo.to_glib_none().0, commit_checksum.to_glib_none().0, cancellable.map(|p| p.as_ref()).to_glib_none().0, &mut error);
             if error.is_null() { Ok(()) } else { Err(from_glib_full(error)) }
         }
     }
 
-    #[cfg(any(feature = "v2020_2", feature = "dox"))]
-    fn commit_verify<P: IsA<gio::Cancellable>>(&self, repo: &Repo, commit_checksum: &str, cancellable: Option<&P>) -> Result<Option<GString>, glib::Error> {
+    fn commit_verify<P: IsA<gio::Cancellable>>(&self, repo: &Repo, commit_checksum: &str, cancellable: Option<&P>) -> Result<Option<glib::GString>, glib::Error> {
         unsafe {
             let mut out_success_message = ptr::null_mut();
             let mut error = ptr::null_mut();
-            let _ = ostree_sys::ostree_sign_commit_verify(self.as_ref().to_glib_none().0, repo.to_glib_none().0, commit_checksum.to_glib_none().0, &mut out_success_message, cancellable.map(|p| p.as_ref()).to_glib_none().0, &mut error);
+            let _ = ffi::ostree_sign_commit_verify(self.as_ref().to_glib_none().0, repo.to_glib_none().0, commit_checksum.to_glib_none().0, &mut out_success_message, cancellable.map(|p| p.as_ref()).to_glib_none().0, &mut error);
             if error.is_null() { Ok(from_glib_full(out_success_message)) } else { Err(from_glib_full(error)) }
         }
     }
 
-    #[cfg(any(feature = "v2020_2", feature = "dox"))]
     fn data<P: IsA<gio::Cancellable>>(&self, data: &glib::Bytes, cancellable: Option<&P>) -> Result<glib::Bytes, glib::Error> {
         unsafe {
             let mut signature = ptr::null_mut();
             let mut error = ptr::null_mut();
-            let _ = ostree_sys::ostree_sign_data(self.as_ref().to_glib_none().0, data.to_glib_none().0, &mut signature, cancellable.map(|p| p.as_ref()).to_glib_none().0, &mut error);
+            let _ = ffi::ostree_sign_data(self.as_ref().to_glib_none().0, data.to_glib_none().0, &mut signature, cancellable.map(|p| p.as_ref()).to_glib_none().0, &mut error);
             if error.is_null() { Ok(from_glib_full(signature)) } else { Err(from_glib_full(error)) }
         }
     }
 
-    #[cfg(any(feature = "v2020_2", feature = "dox"))]
-    fn data_verify(&self, data: &glib::Bytes, signatures: &glib::Variant) -> Result<Option<GString>, glib::Error> {
+    fn data_verify(&self, data: &glib::Bytes, signatures: &glib::Variant) -> Result<Option<glib::GString>, glib::Error> {
         unsafe {
             let mut out_success_message = ptr::null_mut();
             let mut error = ptr::null_mut();
-            let _ = ostree_sys::ostree_sign_data_verify(self.as_ref().to_glib_none().0, data.to_glib_none().0, signatures.to_glib_none().0, &mut out_success_message, &mut error);
+            let _ = ffi::ostree_sign_data_verify(self.as_ref().to_glib_none().0, data.to_glib_none().0, signatures.to_glib_none().0, &mut out_success_message, &mut error);
             if error.is_null() { Ok(from_glib_full(out_success_message)) } else { Err(from_glib_full(error)) }
         }
     }
 
-    #[cfg(any(feature = "v2020_2", feature = "dox"))]
-    fn get_name(&self) -> Option<GString> {
+    fn name(&self) -> Option<glib::GString> {
         unsafe {
-            from_glib_none(ostree_sys::ostree_sign_get_name(self.as_ref().to_glib_none().0))
+            from_glib_none(ffi::ostree_sign_get_name(self.as_ref().to_glib_none().0))
         }
     }
 
-    #[cfg(any(feature = "v2020_2", feature = "dox"))]
     fn load_pk(&self, options: &glib::Variant) -> Result<(), glib::Error> {
         unsafe {
             let mut error = ptr::null_mut();
-            let _ = ostree_sys::ostree_sign_load_pk(self.as_ref().to_glib_none().0, options.to_glib_none().0, &mut error);
+            let _ = ffi::ostree_sign_load_pk(self.as_ref().to_glib_none().0, options.to_glib_none().0, &mut error);
             if error.is_null() { Ok(()) } else { Err(from_glib_full(error)) }
         }
     }
 
-    #[cfg(any(feature = "v2020_2", feature = "dox"))]
-    fn metadata_format(&self) -> Option<GString> {
+    fn metadata_format(&self) -> Option<glib::GString> {
         unsafe {
-            from_glib_none(ostree_sys::ostree_sign_metadata_format(self.as_ref().to_glib_none().0))
+            from_glib_none(ffi::ostree_sign_metadata_format(self.as_ref().to_glib_none().0))
         }
     }
 
-    #[cfg(any(feature = "v2020_2", feature = "dox"))]
-    fn metadata_key(&self) -> Option<GString> {
+    fn metadata_key(&self) -> Option<glib::GString> {
         unsafe {
-            from_glib_none(ostree_sys::ostree_sign_metadata_key(self.as_ref().to_glib_none().0))
+            from_glib_none(ffi::ostree_sign_metadata_key(self.as_ref().to_glib_none().0))
         }
     }
 
-    #[cfg(any(feature = "v2020_2", feature = "dox"))]
     fn set_pk(&self, public_key: &glib::Variant) -> Result<(), glib::Error> {
         unsafe {
             let mut error = ptr::null_mut();
-            let _ = ostree_sys::ostree_sign_set_pk(self.as_ref().to_glib_none().0, public_key.to_glib_none().0, &mut error);
+            let _ = ffi::ostree_sign_set_pk(self.as_ref().to_glib_none().0, public_key.to_glib_none().0, &mut error);
             if error.is_null() { Ok(()) } else { Err(from_glib_full(error)) }
         }
     }
 
-    #[cfg(any(feature = "v2020_2", feature = "dox"))]
     fn set_sk(&self, secret_key: &glib::Variant) -> Result<(), glib::Error> {
         unsafe {
             let mut error = ptr::null_mut();
-            let _ = ostree_sys::ostree_sign_set_sk(self.as_ref().to_glib_none().0, secret_key.to_glib_none().0, &mut error);
+            let _ = ffi::ostree_sign_set_sk(self.as_ref().to_glib_none().0, secret_key.to_glib_none().0, &mut error);
             if error.is_null() { Ok(()) } else { Err(from_glib_full(error)) }
         }
     }
 
-    #[cfg(any(feature = "v2020_2", feature = "dox"))]
     fn summary<P: IsA<gio::Cancellable>>(&self, repo: &Repo, keys: &glib::Variant, cancellable: Option<&P>) -> Result<(), glib::Error> {
         unsafe {
             let mut error = ptr::null_mut();
-            let _ = ostree_sys::ostree_sign_summary(self.as_ref().to_glib_none().0, repo.to_glib_none().0, keys.to_glib_none().0, cancellable.map(|p| p.as_ref()).to_glib_none().0, &mut error);
+            let _ = ffi::ostree_sign_summary(self.as_ref().to_glib_none().0, repo.to_glib_none().0, keys.to_glib_none().0, cancellable.map(|p| p.as_ref()).to_glib_none().0, &mut error);
             if error.is_null() { Ok(()) } else { Err(from_glib_full(error)) }
         }
     }
@@ -204,6 +186,6 @@ impl<O: IsA<Sign>> SignExt for O {
 
 impl fmt::Display for Sign {
     fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        write!(f, "Sign")
+        f.write_str("Sign")
     }
 }
index 27b4123a37a88d4c8e85a9acb14b2aa55537e9f1..f10f630cdf09f0fe2c9199665615fadd518d4826 100644 (file)
 // This file was generated by gir (https://github.com/gtk-rs/gir)
-// from gir-files (https://github.com/gtk-rs/gir-files)
+// from gir-files
 // DO NOT EDIT
 
-use gio;
-use gio_sys;
-use glib;
+use crate::Deployment;
+#[cfg(any(feature = "v2016_4", feature = "dox"))]
+#[cfg_attr(feature = "dox", doc(cfg(feature = "v2016_4")))]
+use crate::DeploymentUnlockedState;
+#[cfg(any(feature = "v2017_7", feature = "dox"))]
+#[cfg_attr(feature = "dox", doc(cfg(feature = "v2017_7")))]
+use crate::Repo;
+#[cfg(any(feature = "v2020_7", feature = "dox"))]
+#[cfg_attr(feature = "dox", doc(cfg(feature = "v2020_7")))]
+use crate::SysrootDeployTreeOpts;
+use crate::SysrootSimpleWriteDeploymentFlags;
+#[cfg(any(feature = "v2017_4", feature = "dox"))]
+#[cfg_attr(feature = "dox", doc(cfg(feature = "v2017_4")))]
+use crate::SysrootWriteDeploymentsOpts;
 use glib::object::IsA;
 #[cfg(any(feature = "v2017_10", feature = "dox"))]
+#[cfg_attr(feature = "dox", doc(cfg(feature = "v2017_10")))]
 use glib::object::ObjectType as ObjectType_;
 #[cfg(any(feature = "v2017_10", feature = "dox"))]
+#[cfg_attr(feature = "dox", doc(cfg(feature = "v2017_10")))]
 use glib::signal::connect_raw;
 #[cfg(any(feature = "v2017_10", feature = "dox"))]
+#[cfg_attr(feature = "dox", doc(cfg(feature = "v2017_10")))]
 use glib::signal::SignalHandlerId;
 use glib::translate::*;
-use glib::GString;
-use glib_sys;
-use gobject_sys;
-#[cfg(any(feature = "v2017_10", feature = "dox"))]
-use libc;
-use ostree_sys;
 use std::boxed::Box as Box_;
 use std::fmt;
 use std::mem;
 #[cfg(any(feature = "v2017_10", feature = "dox"))]
+#[cfg_attr(feature = "dox", doc(cfg(feature = "v2017_10")))]
 use std::mem::transmute;
 use std::pin::Pin;
 use std::ptr;
-use Deployment;
-#[cfg(any(feature = "v2016_4", feature = "dox"))]
-use DeploymentUnlockedState;
-use Repo;
-#[cfg(any(feature = "v2020_7", feature = "dox"))]
-use SysrootDeployTreeOpts;
-use SysrootSimpleWriteDeploymentFlags;
-#[cfg(any(feature = "v2017_4", feature = "dox"))]
-use SysrootWriteDeploymentsOpts;
 
-glib_wrapper! {
-    pub struct Sysroot(Object<ostree_sys::OstreeSysroot, SysrootClass>);
+glib::wrapper! {
+    #[doc(alias = "OstreeSysroot")]
+    pub struct Sysroot(Object<ffi::OstreeSysroot>);
 
     match fn {
-        get_type => || ostree_sys::ostree_sysroot_get_type(),
+        type_ => || ffi::ostree_sysroot_get_type(),
     }
 }
 
 impl Sysroot {
+    #[doc(alias = "ostree_sysroot_new")]
     pub fn new<P: IsA<gio::File>>(path: Option<&P>) -> Sysroot {
         unsafe {
-            from_glib_full(ostree_sys::ostree_sysroot_new(path.map(|p| p.as_ref()).to_glib_none().0))
+            from_glib_full(ffi::ostree_sysroot_new(path.map(|p| p.as_ref()).to_glib_none().0))
         }
     }
 
+    #[doc(alias = "ostree_sysroot_new_default")]
     pub fn new_default() -> Sysroot {
         unsafe {
-            from_glib_full(ostree_sys::ostree_sysroot_new_default())
+            from_glib_full(ffi::ostree_sysroot_new_default())
         }
     }
 
+    #[doc(alias = "ostree_sysroot_cleanup")]
     pub fn cleanup<P: IsA<gio::Cancellable>>(&self, cancellable: Option<&P>) -> Result<(), glib::Error> {
         unsafe {
             let mut error = ptr::null_mut();
-            let _ = ostree_sys::ostree_sysroot_cleanup(self.to_glib_none().0, cancellable.map(|p| p.as_ref()).to_glib_none().0, &mut error);
+            let _ = ffi::ostree_sysroot_cleanup(self.to_glib_none().0, cancellable.map(|p| p.as_ref()).to_glib_none().0, &mut error);
             if error.is_null() { Ok(()) } else { Err(from_glib_full(error)) }
         }
     }
 
     //#[cfg(any(feature = "v2018_6", feature = "dox"))]
+    //#[cfg_attr(feature = "dox", doc(cfg(feature = "v2018_6")))]
+    //#[doc(alias = "ostree_sysroot_cleanup_prune_repo")]
     //pub fn cleanup_prune_repo<P: IsA<gio::Cancellable>>(&self, options: /*Ignored*/&mut RepoPruneOptions, cancellable: Option<&P>) -> Result<(i32, i32, u64), glib::Error> {
-    //    unsafe { TODO: call ostree_sys:ostree_sysroot_cleanup_prune_repo() }
+    //    unsafe { TODO: call ffi:ostree_sysroot_cleanup_prune_repo() }
     //}
 
     #[cfg(any(feature = "v2018_5", feature = "dox"))]
+    #[cfg_attr(feature = "dox", doc(cfg(feature = "v2018_5")))]
+    #[doc(alias = "ostree_sysroot_deploy_tree")]
     pub fn deploy_tree<P: IsA<gio::Cancellable>>(&self, osname: Option<&str>, revision: &str, origin: Option<&glib::KeyFile>, provided_merge_deployment: Option<&Deployment>, override_kernel_argv: &[&str], cancellable: Option<&P>) -> Result<Deployment, glib::Error> {
         unsafe {
             let mut out_new_deployment = ptr::null_mut();
             let mut error = ptr::null_mut();
-            let _ = ostree_sys::ostree_sysroot_deploy_tree(self.to_glib_none().0, osname.to_glib_none().0, revision.to_glib_none().0, origin.to_glib_none().0, provided_merge_deployment.to_glib_none().0, override_kernel_argv.to_glib_none().0, &mut out_new_deployment, cancellable.map(|p| p.as_ref()).to_glib_none().0, &mut error);
+            let _ = ffi::ostree_sysroot_deploy_tree(self.to_glib_none().0, osname.to_glib_none().0, revision.to_glib_none().0, origin.to_glib_none().0, provided_merge_deployment.to_glib_none().0, override_kernel_argv.to_glib_none().0, &mut out_new_deployment, cancellable.map(|p| p.as_ref()).to_glib_none().0, &mut error);
             if error.is_null() { Ok(from_glib_full(out_new_deployment)) } else { Err(from_glib_full(error)) }
         }
     }
 
     #[cfg(any(feature = "v2020_7", feature = "dox"))]
+    #[cfg_attr(feature = "dox", doc(cfg(feature = "v2020_7")))]
+    #[doc(alias = "ostree_sysroot_deploy_tree_with_options")]
     pub fn deploy_tree_with_options<P: IsA<gio::Cancellable>>(&self, osname: Option<&str>, revision: &str, origin: Option<&glib::KeyFile>, provided_merge_deployment: Option<&Deployment>, opts: Option<&SysrootDeployTreeOpts>, cancellable: Option<&P>) -> Result<Deployment, glib::Error> {
         unsafe {
             let mut out_new_deployment = ptr::null_mut();
             let mut error = ptr::null_mut();
-            let _ = ostree_sys::ostree_sysroot_deploy_tree_with_options(self.to_glib_none().0, osname.to_glib_none().0, revision.to_glib_none().0, origin.to_glib_none().0, provided_merge_deployment.to_glib_none().0, mut_override(opts.to_glib_none().0), &mut out_new_deployment, cancellable.map(|p| p.as_ref()).to_glib_none().0, &mut error);
+            let _ = ffi::ostree_sysroot_deploy_tree_with_options(self.to_glib_none().0, osname.to_glib_none().0, revision.to_glib_none().0, origin.to_glib_none().0, provided_merge_deployment.to_glib_none().0, mut_override(opts.to_glib_none().0), &mut out_new_deployment, cancellable.map(|p| p.as_ref()).to_glib_none().0, &mut error);
             if error.is_null() { Ok(from_glib_full(out_new_deployment)) } else { Err(from_glib_full(error)) }
         }
     }
 
+    #[doc(alias = "ostree_sysroot_deployment_set_kargs")]
     pub fn deployment_set_kargs<P: IsA<gio::Cancellable>>(&self, deployment: &Deployment, new_kargs: &[&str], cancellable: Option<&P>) -> Result<(), glib::Error> {
         unsafe {
             let mut error = ptr::null_mut();
-            let _ = ostree_sys::ostree_sysroot_deployment_set_kargs(self.to_glib_none().0, deployment.to_glib_none().0, new_kargs.to_glib_none().0, cancellable.map(|p| p.as_ref()).to_glib_none().0, &mut error);
+            let _ = ffi::ostree_sysroot_deployment_set_kargs(self.to_glib_none().0, deployment.to_glib_none().0, new_kargs.to_glib_none().0, cancellable.map(|p| p.as_ref()).to_glib_none().0, &mut error);
             if error.is_null() { Ok(()) } else { Err(from_glib_full(error)) }
         }
     }
 
+    #[doc(alias = "ostree_sysroot_deployment_set_mutable")]
     pub fn deployment_set_mutable<P: IsA<gio::Cancellable>>(&self, deployment: &Deployment, is_mutable: bool, cancellable: Option<&P>) -> Result<(), glib::Error> {
         unsafe {
             let mut error = ptr::null_mut();
-            let _ = ostree_sys::ostree_sysroot_deployment_set_mutable(self.to_glib_none().0, deployment.to_glib_none().0, is_mutable.to_glib(), cancellable.map(|p| p.as_ref()).to_glib_none().0, &mut error);
+            let _ = ffi::ostree_sysroot_deployment_set_mutable(self.to_glib_none().0, deployment.to_glib_none().0, is_mutable.into_glib(), cancellable.map(|p| p.as_ref()).to_glib_none().0, &mut error);
             if error.is_null() { Ok(()) } else { Err(from_glib_full(error)) }
         }
     }
 
     #[cfg(any(feature = "v2018_3", feature = "dox"))]
+    #[cfg_attr(feature = "dox", doc(cfg(feature = "v2018_3")))]
+    #[doc(alias = "ostree_sysroot_deployment_set_pinned")]
     pub fn deployment_set_pinned(&self, deployment: &Deployment, is_pinned: bool) -> Result<(), glib::Error> {
         unsafe {
             let mut error = ptr::null_mut();
-            let _ = ostree_sys::ostree_sysroot_deployment_set_pinned(self.to_glib_none().0, deployment.to_glib_none().0, is_pinned.to_glib(), &mut error);
+            let _ = ffi::ostree_sysroot_deployment_set_pinned(self.to_glib_none().0, deployment.to_glib_none().0, is_pinned.into_glib(), &mut error);
             if error.is_null() { Ok(()) } else { Err(from_glib_full(error)) }
         }
     }
 
     #[cfg(any(feature = "v2016_4", feature = "dox"))]
+    #[cfg_attr(feature = "dox", doc(cfg(feature = "v2016_4")))]
+    #[doc(alias = "ostree_sysroot_deployment_unlock")]
     pub fn deployment_unlock<P: IsA<gio::Cancellable>>(&self, deployment: &Deployment, unlocked_state: DeploymentUnlockedState, cancellable: Option<&P>) -> Result<(), glib::Error> {
         unsafe {
             let mut error = ptr::null_mut();
-            let _ = ostree_sys::ostree_sysroot_deployment_unlock(self.to_glib_none().0, deployment.to_glib_none().0, unlocked_state.to_glib(), cancellable.map(|p| p.as_ref()).to_glib_none().0, &mut error);
+            let _ = ffi::ostree_sysroot_deployment_unlock(self.to_glib_none().0, deployment.to_glib_none().0, unlocked_state.into_glib(), cancellable.map(|p| p.as_ref()).to_glib_none().0, &mut error);
             if error.is_null() { Ok(()) } else { Err(from_glib_full(error)) }
         }
     }
 
+    #[doc(alias = "ostree_sysroot_ensure_initialized")]
     pub fn ensure_initialized<P: IsA<gio::Cancellable>>(&self, cancellable: Option<&P>) -> Result<(), glib::Error> {
         unsafe {
             let mut error = ptr::null_mut();
-            let _ = ostree_sys::ostree_sysroot_ensure_initialized(self.to_glib_none().0, cancellable.map(|p| p.as_ref()).to_glib_none().0, &mut error);
+            let _ = ffi::ostree_sysroot_ensure_initialized(self.to_glib_none().0, cancellable.map(|p| p.as_ref()).to_glib_none().0, &mut error);
             if error.is_null() { Ok(()) } else { Err(from_glib_full(error)) }
         }
     }
 
-    pub fn get_booted_deployment(&self) -> Option<Deployment> {
+    #[doc(alias = "ostree_sysroot_get_booted_deployment")]
+    #[doc(alias = "get_booted_deployment")]
+    pub fn booted_deployment(&self) -> Option<Deployment> {
         unsafe {
-            from_glib_none(ostree_sys::ostree_sysroot_get_booted_deployment(self.to_glib_none().0))
+            from_glib_none(ffi::ostree_sysroot_get_booted_deployment(self.to_glib_none().0))
         }
     }
 
-    pub fn get_bootversion(&self) -> i32 {
+    #[doc(alias = "ostree_sysroot_get_bootversion")]
+    #[doc(alias = "get_bootversion")]
+    pub fn bootversion(&self) -> i32 {
         unsafe {
-            ostree_sys::ostree_sysroot_get_bootversion(self.to_glib_none().0)
+            ffi::ostree_sysroot_get_bootversion(self.to_glib_none().0)
         }
     }
 
-    pub fn get_deployment_directory(&self, deployment: &Deployment) -> Option<gio::File> {
+    #[doc(alias = "ostree_sysroot_get_deployment_directory")]
+    #[doc(alias = "get_deployment_directory")]
+    pub fn deployment_directory(&self, deployment: &Deployment) -> Option<gio::File> {
         unsafe {
-            from_glib_full(ostree_sys::ostree_sysroot_get_deployment_directory(self.to_glib_none().0, deployment.to_glib_none().0))
+            from_glib_full(ffi::ostree_sysroot_get_deployment_directory(self.to_glib_none().0, deployment.to_glib_none().0))
         }
     }
 
-    pub fn get_deployment_dirpath(&self, deployment: &Deployment) -> Option<GString> {
+    #[doc(alias = "ostree_sysroot_get_deployment_dirpath")]
+    #[doc(alias = "get_deployment_dirpath")]
+    pub fn deployment_dirpath(&self, deployment: &Deployment) -> Option<glib::GString> {
         unsafe {
-            from_glib_full(ostree_sys::ostree_sysroot_get_deployment_dirpath(self.to_glib_none().0, deployment.to_glib_none().0))
+            from_glib_full(ffi::ostree_sysroot_get_deployment_dirpath(self.to_glib_none().0, deployment.to_glib_none().0))
         }
     }
 
-    pub fn get_deployments(&self) -> Vec<Deployment> {
+    #[doc(alias = "ostree_sysroot_get_deployments")]
+    #[doc(alias = "get_deployments")]
+    pub fn deployments(&self) -> Vec<Deployment> {
         unsafe {
-            FromGlibPtrContainer::from_glib_container(ostree_sys::ostree_sysroot_get_deployments(self.to_glib_none().0))
+            FromGlibPtrContainer::from_glib_container(ffi::ostree_sysroot_get_deployments(self.to_glib_none().0))
         }
     }
 
-    pub fn get_fd(&self) -> i32 {
+    #[doc(alias = "ostree_sysroot_get_fd")]
+    #[doc(alias = "get_fd")]
+    pub fn fd(&self) -> i32 {
         unsafe {
-            ostree_sys::ostree_sysroot_get_fd(self.to_glib_none().0)
+            ffi::ostree_sysroot_get_fd(self.to_glib_none().0)
         }
     }
 
-    pub fn get_merge_deployment(&self, osname: Option<&str>) -> Option<Deployment> {
+    #[doc(alias = "ostree_sysroot_get_merge_deployment")]
+    #[doc(alias = "get_merge_deployment")]
+    pub fn merge_deployment(&self, osname: Option<&str>) -> Option<Deployment> {
         unsafe {
-            from_glib_full(ostree_sys::ostree_sysroot_get_merge_deployment(self.to_glib_none().0, osname.to_glib_none().0))
+            from_glib_full(ffi::ostree_sysroot_get_merge_deployment(self.to_glib_none().0, osname.to_glib_none().0))
         }
     }
 
-    pub fn get_path(&self) -> Option<gio::File> {
+    #[doc(alias = "ostree_sysroot_get_path")]
+    #[doc(alias = "get_path")]
+    pub fn path(&self) -> Option<gio::File> {
         unsafe {
-            from_glib_none(ostree_sys::ostree_sysroot_get_path(self.to_glib_none().0))
-        }
-    }
-
-    pub fn get_repo<P: IsA<gio::Cancellable>>(&self, cancellable: Option<&P>) -> Result<Repo, glib::Error> {
-        unsafe {
-            let mut out_repo = ptr::null_mut();
-            let mut error = ptr::null_mut();
-            let _ = ostree_sys::ostree_sysroot_get_repo(self.to_glib_none().0, &mut out_repo, cancellable.map(|p| p.as_ref()).to_glib_none().0, &mut error);
-            if error.is_null() { Ok(from_glib_full(out_repo)) } else { Err(from_glib_full(error)) }
+            from_glib_none(ffi::ostree_sysroot_get_path(self.to_glib_none().0))
         }
     }
 
     #[cfg(any(feature = "v2018_5", feature = "dox"))]
-    pub fn get_staged_deployment(&self) -> Option<Deployment> {
+    #[cfg_attr(feature = "dox", doc(cfg(feature = "v2018_5")))]
+    #[doc(alias = "ostree_sysroot_get_staged_deployment")]
+    #[doc(alias = "get_staged_deployment")]
+    pub fn staged_deployment(&self) -> Option<Deployment> {
         unsafe {
-            from_glib_none(ostree_sys::ostree_sysroot_get_staged_deployment(self.to_glib_none().0))
+            from_glib_none(ffi::ostree_sysroot_get_staged_deployment(self.to_glib_none().0))
         }
     }
 
-    pub fn get_subbootversion(&self) -> i32 {
+    #[doc(alias = "ostree_sysroot_get_subbootversion")]
+    #[doc(alias = "get_subbootversion")]
+    pub fn subbootversion(&self) -> i32 {
         unsafe {
-            ostree_sys::ostree_sysroot_get_subbootversion(self.to_glib_none().0)
+            ffi::ostree_sysroot_get_subbootversion(self.to_glib_none().0)
         }
     }
 
     #[cfg(any(feature = "v2016_4", feature = "dox"))]
+    #[cfg_attr(feature = "dox", doc(cfg(feature = "v2016_4")))]
+    #[doc(alias = "ostree_sysroot_init_osname")]
     pub fn init_osname<P: IsA<gio::Cancellable>>(&self, osname: &str, cancellable: Option<&P>) -> Result<(), glib::Error> {
         unsafe {
             let mut error = ptr::null_mut();
-            let _ = ostree_sys::ostree_sysroot_init_osname(self.to_glib_none().0, osname.to_glib_none().0, cancellable.map(|p| p.as_ref()).to_glib_none().0, &mut error);
+            let _ = ffi::ostree_sysroot_init_osname(self.to_glib_none().0, osname.to_glib_none().0, cancellable.map(|p| p.as_ref()).to_glib_none().0, &mut error);
             if error.is_null() { Ok(()) } else { Err(from_glib_full(error)) }
         }
     }
 
     #[cfg(any(feature = "v2020_1", feature = "dox"))]
+    #[cfg_attr(feature = "dox", doc(cfg(feature = "v2020_1")))]
+    #[doc(alias = "ostree_sysroot_initialize")]
     pub fn initialize(&self) -> Result<(), glib::Error> {
         unsafe {
             let mut error = ptr::null_mut();
-            let _ = ostree_sys::ostree_sysroot_initialize(self.to_glib_none().0, &mut error);
+            let _ = ffi::ostree_sysroot_initialize(self.to_glib_none().0, &mut error);
             if error.is_null() { Ok(()) } else { Err(from_glib_full(error)) }
         }
     }
 
     #[cfg(any(feature = "v2020_1", feature = "dox"))]
+    #[cfg_attr(feature = "dox", doc(cfg(feature = "v2020_1")))]
+    #[doc(alias = "ostree_sysroot_is_booted")]
     pub fn is_booted(&self) -> bool {
         unsafe {
-            from_glib(ostree_sys::ostree_sysroot_is_booted(self.to_glib_none().0))
+            from_glib(ffi::ostree_sysroot_is_booted(self.to_glib_none().0))
         }
     }
 
+    #[doc(alias = "ostree_sysroot_load")]
     pub fn load<P: IsA<gio::Cancellable>>(&self, cancellable: Option<&P>) -> Result<(), glib::Error> {
         unsafe {
             let mut error = ptr::null_mut();
-            let _ = ostree_sys::ostree_sysroot_load(self.to_glib_none().0, cancellable.map(|p| p.as_ref()).to_glib_none().0, &mut error);
+            let _ = ffi::ostree_sysroot_load(self.to_glib_none().0, cancellable.map(|p| p.as_ref()).to_glib_none().0, &mut error);
             if error.is_null() { Ok(()) } else { Err(from_glib_full(error)) }
         }
     }
 
     #[cfg(any(feature = "v2016_4", feature = "dox"))]
+    #[cfg_attr(feature = "dox", doc(cfg(feature = "v2016_4")))]
+    #[doc(alias = "ostree_sysroot_load_if_changed")]
     pub fn load_if_changed<P: IsA<gio::Cancellable>>(&self, cancellable: Option<&P>) -> Result<bool, glib::Error> {
         unsafe {
             let mut out_changed = mem::MaybeUninit::uninit();
             let mut error = ptr::null_mut();
-            let _ = ostree_sys::ostree_sysroot_load_if_changed(self.to_glib_none().0, out_changed.as_mut_ptr(), cancellable.map(|p| p.as_ref()).to_glib_none().0, &mut error);
+            let _ = ffi::ostree_sysroot_load_if_changed(self.to_glib_none().0, out_changed.as_mut_ptr(), cancellable.map(|p| p.as_ref()).to_glib_none().0, &mut error);
             let out_changed = out_changed.assume_init();
             if error.is_null() { Ok(from_glib(out_changed)) } else { Err(from_glib_full(error)) }
         }
     }
 
+    #[doc(alias = "ostree_sysroot_lock")]
     pub fn lock(&self) -> Result<(), glib::Error> {
         unsafe {
             let mut error = ptr::null_mut();
-            let _ = ostree_sys::ostree_sysroot_lock(self.to_glib_none().0, &mut error);
+            let _ = ffi::ostree_sysroot_lock(self.to_glib_none().0, &mut error);
             if error.is_null() { Ok(()) } else { Err(from_glib_full(error)) }
         }
     }
 
+    #[doc(alias = "ostree_sysroot_lock_async")]
     pub fn lock_async<P: IsA<gio::Cancellable>, Q: FnOnce(Result<(), glib::Error>) + Send + 'static>(&self, cancellable: Option<&P>, callback: Q) {
         let user_data: Box_<Q> = Box_::new(callback);
-        unsafe extern "C" fn lock_async_trampoline<Q: FnOnce(Result<(), glib::Error>) + Send + 'static>(_source_object: *mut gobject_sys::GObject, res: *mut gio_sys::GAsyncResult, user_data: glib_sys::gpointer) {
+        unsafe extern "C" fn lock_async_trampoline<Q: FnOnce(Result<(), glib::Error>) + Send + 'static>(_source_object: *mut glib::gobject_ffi::GObject, res: *mut gio::ffi::GAsyncResult, user_data: glib::ffi::gpointer) {
             let mut error = ptr::null_mut();
-            let _ = ostree_sys::ostree_sysroot_lock_finish(_source_object as *mut _, res, &mut error);
+            let _ = ffi::ostree_sysroot_lock_finish(_source_object as *mut _, res, &mut error);
             let result = if error.is_null() { Ok(()) } else { Err(from_glib_full(error)) };
             let callback: Box_<Q> = Box_::from_raw(user_data as *mut _);
             callback(result);
         }
         let callback = lock_async_trampoline::<Q>;
         unsafe {
-            ostree_sys::ostree_sysroot_lock_async(self.to_glib_none().0, cancellable.map(|p| p.as_ref()).to_glib_none().0, Some(callback), Box_::into_raw(user_data) as *mut _);
+            ffi::ostree_sysroot_lock_async(self.to_glib_none().0, cancellable.map(|p| p.as_ref()).to_glib_none().0, Some(callback), Box_::into_raw(user_data) as *mut _);
         }
     }
 
     
     pub fn lock_async_future(&self) -> Pin<Box_<dyn std::future::Future<Output = Result<(), glib::Error>> + 'static>> {
 
-        Box_::pin(gio::GioFuture::new(self, move |obj, send| {
-            let cancellable = gio::Cancellable::new();
+        Box_::pin(gio::GioFuture::new(self, move |obj, cancellable, send| {
             obj.lock_async(
-                Some(&cancellable),
+                Some(cancellable),
                 move |res| {
                     send.resolve(res);
                 },
             );
-
-            cancellable
         }))
     }
 
+    #[doc(alias = "ostree_sysroot_origin_new_from_refspec")]
     pub fn origin_new_from_refspec(&self, refspec: &str) -> Option<glib::KeyFile> {
         unsafe {
-            from_glib_full(ostree_sys::ostree_sysroot_origin_new_from_refspec(self.to_glib_none().0, refspec.to_glib_none().0))
+            from_glib_full(ffi::ostree_sysroot_origin_new_from_refspec(self.to_glib_none().0, refspec.to_glib_none().0))
         }
     }
 
+    #[doc(alias = "ostree_sysroot_prepare_cleanup")]
     pub fn prepare_cleanup<P: IsA<gio::Cancellable>>(&self, cancellable: Option<&P>) -> Result<(), glib::Error> {
         unsafe {
             let mut error = ptr::null_mut();
-            let _ = ostree_sys::ostree_sysroot_prepare_cleanup(self.to_glib_none().0, cancellable.map(|p| p.as_ref()).to_glib_none().0, &mut error);
+            let _ = ffi::ostree_sysroot_prepare_cleanup(self.to_glib_none().0, cancellable.map(|p| p.as_ref()).to_glib_none().0, &mut error);
             if error.is_null() { Ok(()) } else { Err(from_glib_full(error)) }
         }
     }
 
     #[cfg(any(feature = "v2017_7", feature = "dox"))]
+    #[cfg_attr(feature = "dox", doc(cfg(feature = "v2017_7")))]
+    #[doc(alias = "ostree_sysroot_query_deployments_for")]
     pub fn query_deployments_for(&self, osname: Option<&str>) -> (Option<Deployment>, Option<Deployment>) {
         unsafe {
             let mut out_pending = ptr::null_mut();
             let mut out_rollback = ptr::null_mut();
-            ostree_sys::ostree_sysroot_query_deployments_for(self.to_glib_none().0, osname.to_glib_none().0, &mut out_pending, &mut out_rollback);
+            ffi::ostree_sysroot_query_deployments_for(self.to_glib_none().0, osname.to_glib_none().0, &mut out_pending, &mut out_rollback);
             (from_glib_full(out_pending), from_glib_full(out_rollback))
         }
     }
 
     #[cfg(any(feature = "v2017_7", feature = "dox"))]
+    #[cfg_attr(feature = "dox", doc(cfg(feature = "v2017_7")))]
+    #[doc(alias = "ostree_sysroot_repo")]
     pub fn repo(&self) -> Option<Repo> {
         unsafe {
-            from_glib_none(ostree_sys::ostree_sysroot_repo(self.to_glib_none().0))
+            from_glib_none(ffi::ostree_sysroot_repo(self.to_glib_none().0))
         }
     }
 
     #[cfg(any(feature = "v2021_1", feature = "dox"))]
+    #[cfg_attr(feature = "dox", doc(cfg(feature = "v2021_1")))]
+    #[doc(alias = "ostree_sysroot_require_booted_deployment")]
     pub fn require_booted_deployment(&self) -> Result<Deployment, glib::Error> {
         unsafe {
             let mut error = ptr::null_mut();
-            let ret = ostree_sys::ostree_sysroot_require_booted_deployment(self.to_glib_none().0, &mut error);
+            let ret = ffi::ostree_sysroot_require_booted_deployment(self.to_glib_none().0, &mut error);
             if error.is_null() { Ok(from_glib_none(ret)) } else { Err(from_glib_full(error)) }
         }
     }
 
     #[cfg(any(feature = "v2020_1", feature = "dox"))]
+    #[cfg_attr(feature = "dox", doc(cfg(feature = "v2020_1")))]
+    #[doc(alias = "ostree_sysroot_set_mount_namespace_in_use")]
     pub fn set_mount_namespace_in_use(&self) {
         unsafe {
-            ostree_sys::ostree_sysroot_set_mount_namespace_in_use(self.to_glib_none().0);
+            ffi::ostree_sysroot_set_mount_namespace_in_use(self.to_glib_none().0);
         }
     }
 
+    #[doc(alias = "ostree_sysroot_simple_write_deployment")]
     pub fn simple_write_deployment<P: IsA<gio::Cancellable>>(&self, osname: Option<&str>, new_deployment: &Deployment, merge_deployment: Option<&Deployment>, flags: SysrootSimpleWriteDeploymentFlags, cancellable: Option<&P>) -> Result<(), glib::Error> {
         unsafe {
             let mut error = ptr::null_mut();
-            let _ = ostree_sys::ostree_sysroot_simple_write_deployment(self.to_glib_none().0, osname.to_glib_none().0, new_deployment.to_glib_none().0, merge_deployment.to_glib_none().0, flags.to_glib(), cancellable.map(|p| p.as_ref()).to_glib_none().0, &mut error);
+            let _ = ffi::ostree_sysroot_simple_write_deployment(self.to_glib_none().0, osname.to_glib_none().0, new_deployment.to_glib_none().0, merge_deployment.to_glib_none().0, flags.into_glib(), cancellable.map(|p| p.as_ref()).to_glib_none().0, &mut error);
             if error.is_null() { Ok(()) } else { Err(from_glib_full(error)) }
         }
     }
 
     #[cfg(any(feature = "v2020_7", feature = "dox"))]
-    pub fn stage_overlay_initrd<P: IsA<gio::Cancellable>>(&self, fd: i32, cancellable: Option<&P>) -> Result<GString, glib::Error> {
+    #[cfg_attr(feature = "dox", doc(cfg(feature = "v2020_7")))]
+    #[doc(alias = "ostree_sysroot_stage_overlay_initrd")]
+    pub fn stage_overlay_initrd<P: IsA<gio::Cancellable>>(&self, fd: i32, cancellable: Option<&P>) -> Result<glib::GString, glib::Error> {
         unsafe {
             let mut out_checksum = ptr::null_mut();
             let mut error = ptr::null_mut();
-            let _ = ostree_sys::ostree_sysroot_stage_overlay_initrd(self.to_glib_none().0, fd, &mut out_checksum, cancellable.map(|p| p.as_ref()).to_glib_none().0, &mut error);
+            let _ = ffi::ostree_sysroot_stage_overlay_initrd(self.to_glib_none().0, fd, &mut out_checksum, cancellable.map(|p| p.as_ref()).to_glib_none().0, &mut error);
             if error.is_null() { Ok(from_glib_full(out_checksum)) } else { Err(from_glib_full(error)) }
         }
     }
 
     #[cfg(any(feature = "v2018_5", feature = "dox"))]
+    #[cfg_attr(feature = "dox", doc(cfg(feature = "v2018_5")))]
+    #[doc(alias = "ostree_sysroot_stage_tree")]
     pub fn stage_tree<P: IsA<gio::Cancellable>>(&self, osname: Option<&str>, revision: &str, origin: Option<&glib::KeyFile>, merge_deployment: Option<&Deployment>, override_kernel_argv: &[&str], cancellable: Option<&P>) -> Result<Deployment, glib::Error> {
         unsafe {
             let mut out_new_deployment = ptr::null_mut();
             let mut error = ptr::null_mut();
-            let _ = ostree_sys::ostree_sysroot_stage_tree(self.to_glib_none().0, osname.to_glib_none().0, revision.to_glib_none().0, origin.to_glib_none().0, merge_deployment.to_glib_none().0, override_kernel_argv.to_glib_none().0, &mut out_new_deployment, cancellable.map(|p| p.as_ref()).to_glib_none().0, &mut error);
+            let _ = ffi::ostree_sysroot_stage_tree(self.to_glib_none().0, osname.to_glib_none().0, revision.to_glib_none().0, origin.to_glib_none().0, merge_deployment.to_glib_none().0, override_kernel_argv.to_glib_none().0, &mut out_new_deployment, cancellable.map(|p| p.as_ref()).to_glib_none().0, &mut error);
             if error.is_null() { Ok(from_glib_full(out_new_deployment)) } else { Err(from_glib_full(error)) }
         }
     }
 
     #[cfg(any(feature = "v2020_7", feature = "dox"))]
+    #[cfg_attr(feature = "dox", doc(cfg(feature = "v2020_7")))]
+    #[doc(alias = "ostree_sysroot_stage_tree_with_options")]
     pub fn stage_tree_with_options<P: IsA<gio::Cancellable>>(&self, osname: Option<&str>, revision: &str, origin: Option<&glib::KeyFile>, merge_deployment: Option<&Deployment>, opts: &SysrootDeployTreeOpts, cancellable: Option<&P>) -> Result<Deployment, glib::Error> {
         unsafe {
             let mut out_new_deployment = ptr::null_mut();
             let mut error = ptr::null_mut();
-            let _ = ostree_sys::ostree_sysroot_stage_tree_with_options(self.to_glib_none().0, osname.to_glib_none().0, revision.to_glib_none().0, origin.to_glib_none().0, merge_deployment.to_glib_none().0, mut_override(opts.to_glib_none().0), &mut out_new_deployment, cancellable.map(|p| p.as_ref()).to_glib_none().0, &mut error);
+            let _ = ffi::ostree_sysroot_stage_tree_with_options(self.to_glib_none().0, osname.to_glib_none().0, revision.to_glib_none().0, origin.to_glib_none().0, merge_deployment.to_glib_none().0, mut_override(opts.to_glib_none().0), &mut out_new_deployment, cancellable.map(|p| p.as_ref()).to_glib_none().0, &mut error);
             if error.is_null() { Ok(from_glib_full(out_new_deployment)) } else { Err(from_glib_full(error)) }
         }
     }
 
+    #[doc(alias = "ostree_sysroot_try_lock")]
     pub fn try_lock(&self) -> Result<bool, glib::Error> {
         unsafe {
             let mut out_acquired = mem::MaybeUninit::uninit();
             let mut error = ptr::null_mut();
-            let _ = ostree_sys::ostree_sysroot_try_lock(self.to_glib_none().0, out_acquired.as_mut_ptr(), &mut error);
+            let _ = ffi::ostree_sysroot_try_lock(self.to_glib_none().0, out_acquired.as_mut_ptr(), &mut error);
             let out_acquired = out_acquired.assume_init();
             if error.is_null() { Ok(from_glib(out_acquired)) } else { Err(from_glib_full(error)) }
         }
     }
 
+    #[doc(alias = "ostree_sysroot_unload")]
     pub fn unload(&self) {
         unsafe {
-            ostree_sys::ostree_sysroot_unload(self.to_glib_none().0);
+            ffi::ostree_sysroot_unload(self.to_glib_none().0);
         }
     }
 
+    #[doc(alias = "ostree_sysroot_unlock")]
     pub fn unlock(&self) {
         unsafe {
-            ostree_sys::ostree_sysroot_unlock(self.to_glib_none().0);
+            ffi::ostree_sysroot_unlock(self.to_glib_none().0);
         }
     }
 
+    #[doc(alias = "ostree_sysroot_write_deployments")]
     pub fn write_deployments<P: IsA<gio::Cancellable>>(&self, new_deployments: &[Deployment], cancellable: Option<&P>) -> Result<(), glib::Error> {
         unsafe {
             let mut error = ptr::null_mut();
-            let _ = ostree_sys::ostree_sysroot_write_deployments(self.to_glib_none().0, new_deployments.to_glib_none().0, cancellable.map(|p| p.as_ref()).to_glib_none().0, &mut error);
+            let _ = ffi::ostree_sysroot_write_deployments(self.to_glib_none().0, new_deployments.to_glib_none().0, cancellable.map(|p| p.as_ref()).to_glib_none().0, &mut error);
             if error.is_null() { Ok(()) } else { Err(from_glib_full(error)) }
         }
     }
 
     #[cfg(any(feature = "v2017_4", feature = "dox"))]
+    #[cfg_attr(feature = "dox", doc(cfg(feature = "v2017_4")))]
+    #[doc(alias = "ostree_sysroot_write_deployments_with_options")]
     pub fn write_deployments_with_options<P: IsA<gio::Cancellable>>(&self, new_deployments: &[Deployment], opts: &SysrootWriteDeploymentsOpts, cancellable: Option<&P>) -> Result<(), glib::Error> {
         unsafe {
             let mut error = ptr::null_mut();
-            let _ = ostree_sys::ostree_sysroot_write_deployments_with_options(self.to_glib_none().0, new_deployments.to_glib_none().0, mut_override(opts.to_glib_none().0), cancellable.map(|p| p.as_ref()).to_glib_none().0, &mut error);
+            let _ = ffi::ostree_sysroot_write_deployments_with_options(self.to_glib_none().0, new_deployments.to_glib_none().0, mut_override(opts.to_glib_none().0), cancellable.map(|p| p.as_ref()).to_glib_none().0, &mut error);
             if error.is_null() { Ok(()) } else { Err(from_glib_full(error)) }
         }
     }
 
+    #[doc(alias = "ostree_sysroot_write_origin_file")]
     pub fn write_origin_file<P: IsA<gio::Cancellable>>(&self, deployment: &Deployment, new_origin: Option<&glib::KeyFile>, cancellable: Option<&P>) -> Result<(), glib::Error> {
         unsafe {
             let mut error = ptr::null_mut();
-            let _ = ostree_sys::ostree_sysroot_write_origin_file(self.to_glib_none().0, deployment.to_glib_none().0, new_origin.to_glib_none().0, cancellable.map(|p| p.as_ref()).to_glib_none().0, &mut error);
+            let _ = ffi::ostree_sysroot_write_origin_file(self.to_glib_none().0, deployment.to_glib_none().0, new_origin.to_glib_none().0, cancellable.map(|p| p.as_ref()).to_glib_none().0, &mut error);
             if error.is_null() { Ok(()) } else { Err(from_glib_full(error)) }
         }
     }
 
-    pub fn get_deployment_origin_path<P: IsA<gio::File>>(deployment_path: &P) -> Option<gio::File> {
+    #[doc(alias = "ostree_sysroot_get_deployment_origin_path")]
+    #[doc(alias = "get_deployment_origin_path")]
+    pub fn deployment_origin_path<P: IsA<gio::File>>(deployment_path: &P) -> Option<gio::File> {
         unsafe {
-            from_glib_full(ostree_sys::ostree_sysroot_get_deployment_origin_path(deployment_path.as_ref().to_glib_none().0))
+            from_glib_full(ffi::ostree_sysroot_get_deployment_origin_path(deployment_path.as_ref().to_glib_none().0))
         }
     }
 
     #[cfg(any(feature = "v2017_10", feature = "dox"))]
-    pub fn connect_journal_msg<F: Fn(&Sysroot, &str) + 'static>(&self, f: F) -> SignalHandlerId {
-        unsafe extern "C" fn journal_msg_trampoline<F: Fn(&Sysroot, &str) + 'static>(this: *mut ostree_sys::OstreeSysroot, msg: *mut libc::c_char, f: glib_sys::gpointer) {
+    #[cfg_attr(feature = "dox", doc(cfg(feature = "v2017_10")))]
+    #[doc(alias = "journal-msg")]
+    pub fn connect_journal_msg<F: Fn(&Self, &str) + 'static>(&self, f: F) -> SignalHandlerId {
+        unsafe extern "C" fn journal_msg_trampoline<F: Fn(&Sysroot, &str) + 'static>(this: *mut ffi::OstreeSysroot, msg: *mut libc::c_char, f: glib::ffi::gpointer) {
             let f: &F = &*(f as *const F);
-            f(&from_glib_borrow(this), &GString::from_glib_borrow(msg))
+            f(&from_glib_borrow(this), &glib::GString::from_glib_borrow(msg))
         }
         unsafe {
             let f: Box_<F> = Box_::new(f);
@@ -439,6 +504,6 @@ impl Sysroot {
 
 impl fmt::Display for Sysroot {
     fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        write!(f, "Sysroot")
+        f.write_str("Sysroot")
     }
 }
index 0f7cd1c2dc34ccd9ee2c564c61454e6516a79e2c..0e932534e063768b165f3ce3ea88f8ab29259c30 100644 (file)
 // This file was generated by gir (https://github.com/gtk-rs/gir)
-// from gir-files (https://github.com/gtk-rs/gir-files)
+// from gir-files
 // DO NOT EDIT
 
-use gio;
-use glib;
+use crate::AsyncProgress;
+use crate::Repo;
+use crate::RepoPullFlags;
+use crate::Sysroot;
+use crate::SysrootUpgraderFlags;
+use crate::SysrootUpgraderPullFlags;
 use glib::object::IsA;
 use glib::object::ObjectType as ObjectType_;
 use glib::translate::*;
-use glib::GString;
 use glib::StaticType;
-use glib::Value;
-use gobject_sys;
-use ostree_sys;
 use std::fmt;
 use std::mem;
 use std::ptr;
-use AsyncProgress;
-use Repo;
-use RepoPullFlags;
-use Sysroot;
-use SysrootUpgraderFlags;
-use SysrootUpgraderPullFlags;
 
-glib_wrapper! {
-    pub struct SysrootUpgrader(Object<ostree_sys::OstreeSysrootUpgrader, SysrootUpgraderClass>);
+glib::wrapper! {
+    #[doc(alias = "OstreeSysrootUpgrader")]
+    pub struct SysrootUpgrader(Object<ffi::OstreeSysrootUpgrader>);
 
     match fn {
-        get_type => || ostree_sys::ostree_sysroot_upgrader_get_type(),
+        type_ => || ffi::ostree_sysroot_upgrader_get_type(),
     }
 }
 
 impl SysrootUpgrader {
+    #[doc(alias = "ostree_sysroot_upgrader_new")]
     pub fn new<P: IsA<gio::Cancellable>>(sysroot: &Sysroot, cancellable: Option<&P>) -> Result<SysrootUpgrader, glib::Error> {
         unsafe {
             let mut error = ptr::null_mut();
-            let ret = ostree_sys::ostree_sysroot_upgrader_new(sysroot.to_glib_none().0, cancellable.map(|p| p.as_ref()).to_glib_none().0, &mut error);
+            let ret = ffi::ostree_sysroot_upgrader_new(sysroot.to_glib_none().0, cancellable.map(|p| p.as_ref()).to_glib_none().0, &mut error);
             if error.is_null() { Ok(from_glib_full(ret)) } else { Err(from_glib_full(error)) }
         }
     }
 
-    pub fn new_for_os<P: IsA<gio::Cancellable>>(sysroot: &Sysroot, osname: Option<&str>, cancellable: Option<&P>) -> Result<SysrootUpgrader, glib::Error> {
+    #[doc(alias = "ostree_sysroot_upgrader_new_for_os")]
+    #[doc(alias = "new_for_os")]
+    pub fn for_os<P: IsA<gio::Cancellable>>(sysroot: &Sysroot, osname: Option<&str>, cancellable: Option<&P>) -> Result<SysrootUpgrader, glib::Error> {
         unsafe {
             let mut error = ptr::null_mut();
-            let ret = ostree_sys::ostree_sysroot_upgrader_new_for_os(sysroot.to_glib_none().0, osname.to_glib_none().0, cancellable.map(|p| p.as_ref()).to_glib_none().0, &mut error);
+            let ret = ffi::ostree_sysroot_upgrader_new_for_os(sysroot.to_glib_none().0, osname.to_glib_none().0, cancellable.map(|p| p.as_ref()).to_glib_none().0, &mut error);
             if error.is_null() { Ok(from_glib_full(ret)) } else { Err(from_glib_full(error)) }
         }
     }
 
-    pub fn new_for_os_with_flags<P: IsA<gio::Cancellable>>(sysroot: &Sysroot, osname: Option<&str>, flags: SysrootUpgraderFlags, cancellable: Option<&P>) -> Result<SysrootUpgrader, glib::Error> {
+    #[doc(alias = "ostree_sysroot_upgrader_new_for_os_with_flags")]
+    #[doc(alias = "new_for_os_with_flags")]
+    pub fn for_os_with_flags<P: IsA<gio::Cancellable>>(sysroot: &Sysroot, osname: Option<&str>, flags: SysrootUpgraderFlags, cancellable: Option<&P>) -> Result<SysrootUpgrader, glib::Error> {
         unsafe {
             let mut error = ptr::null_mut();
-            let ret = ostree_sys::ostree_sysroot_upgrader_new_for_os_with_flags(sysroot.to_glib_none().0, osname.to_glib_none().0, flags.to_glib(), cancellable.map(|p| p.as_ref()).to_glib_none().0, &mut error);
+            let ret = ffi::ostree_sysroot_upgrader_new_for_os_with_flags(sysroot.to_glib_none().0, osname.to_glib_none().0, flags.into_glib(), cancellable.map(|p| p.as_ref()).to_glib_none().0, &mut error);
             if error.is_null() { Ok(from_glib_full(ret)) } else { Err(from_glib_full(error)) }
         }
     }
 
+    #[doc(alias = "ostree_sysroot_upgrader_deploy")]
     pub fn deploy<P: IsA<gio::Cancellable>>(&self, cancellable: Option<&P>) -> Result<(), glib::Error> {
         unsafe {
             let mut error = ptr::null_mut();
-            let _ = ostree_sys::ostree_sysroot_upgrader_deploy(self.to_glib_none().0, cancellable.map(|p| p.as_ref()).to_glib_none().0, &mut error);
+            let _ = ffi::ostree_sysroot_upgrader_deploy(self.to_glib_none().0, cancellable.map(|p| p.as_ref()).to_glib_none().0, &mut error);
             if error.is_null() { Ok(()) } else { Err(from_glib_full(error)) }
         }
     }
 
+    #[doc(alias = "ostree_sysroot_upgrader_dup_origin")]
     pub fn dup_origin(&self) -> Option<glib::KeyFile> {
         unsafe {
-            from_glib_full(ostree_sys::ostree_sysroot_upgrader_dup_origin(self.to_glib_none().0))
+            from_glib_full(ffi::ostree_sysroot_upgrader_dup_origin(self.to_glib_none().0))
         }
     }
 
-    pub fn get_origin(&self) -> Option<glib::KeyFile> {
+    #[doc(alias = "ostree_sysroot_upgrader_get_origin")]
+    #[doc(alias = "get_origin")]
+    pub fn origin(&self) -> Option<glib::KeyFile> {
         unsafe {
-            from_glib_none(ostree_sys::ostree_sysroot_upgrader_get_origin(self.to_glib_none().0))
+            from_glib_none(ffi::ostree_sysroot_upgrader_get_origin(self.to_glib_none().0))
         }
     }
 
-    pub fn get_origin_description(&self) -> Option<GString> {
+    #[doc(alias = "ostree_sysroot_upgrader_get_origin_description")]
+    #[doc(alias = "get_origin_description")]
+    pub fn origin_description(&self) -> Option<glib::GString> {
         unsafe {
-            from_glib_full(ostree_sys::ostree_sysroot_upgrader_get_origin_description(self.to_glib_none().0))
+            from_glib_full(ffi::ostree_sysroot_upgrader_get_origin_description(self.to_glib_none().0))
         }
     }
 
-    pub fn pull<P: IsA<AsyncProgress>, Q: IsA<gio::Cancellable>>(&self, flags: RepoPullFlags, upgrader_flags: SysrootUpgraderPullFlags, progress: Option<&P>, cancellable: Option<&Q>) -> Result<bool, glib::Error> {
+    #[doc(alias = "ostree_sysroot_upgrader_pull")]
+    pub fn pull<P: IsA<gio::Cancellable>>(&self, flags: RepoPullFlags, upgrader_flags: SysrootUpgraderPullFlags, progress: Option<&AsyncProgress>, cancellable: Option<&P>) -> Result<bool, glib::Error> {
         unsafe {
             let mut out_changed = mem::MaybeUninit::uninit();
             let mut error = ptr::null_mut();
-            let _ = ostree_sys::ostree_sysroot_upgrader_pull(self.to_glib_none().0, flags.to_glib(), upgrader_flags.to_glib(), progress.map(|p| p.as_ref()).to_glib_none().0, out_changed.as_mut_ptr(), cancellable.map(|p| p.as_ref()).to_glib_none().0, &mut error);
+            let _ = ffi::ostree_sysroot_upgrader_pull(self.to_glib_none().0, flags.into_glib(), upgrader_flags.into_glib(), progress.to_glib_none().0, out_changed.as_mut_ptr(), cancellable.map(|p| p.as_ref()).to_glib_none().0, &mut error);
             let out_changed = out_changed.assume_init();
             if error.is_null() { Ok(from_glib(out_changed)) } else { Err(from_glib_full(error)) }
         }
     }
 
-    pub fn pull_one_dir<P: IsA<AsyncProgress>, Q: IsA<gio::Cancellable>>(&self, dir_to_pull: &str, flags: RepoPullFlags, upgrader_flags: SysrootUpgraderPullFlags, progress: Option<&P>, cancellable: Option<&Q>) -> Result<bool, glib::Error> {
+    #[doc(alias = "ostree_sysroot_upgrader_pull_one_dir")]
+    pub fn pull_one_dir<P: IsA<gio::Cancellable>>(&self, dir_to_pull: &str, flags: RepoPullFlags, upgrader_flags: SysrootUpgraderPullFlags, progress: Option<&AsyncProgress>, cancellable: Option<&P>) -> Result<bool, glib::Error> {
         unsafe {
             let mut out_changed = mem::MaybeUninit::uninit();
             let mut error = ptr::null_mut();
-            let _ = ostree_sys::ostree_sysroot_upgrader_pull_one_dir(self.to_glib_none().0, dir_to_pull.to_glib_none().0, flags.to_glib(), upgrader_flags.to_glib(), progress.map(|p| p.as_ref()).to_glib_none().0, out_changed.as_mut_ptr(), cancellable.map(|p| p.as_ref()).to_glib_none().0, &mut error);
+            let _ = ffi::ostree_sysroot_upgrader_pull_one_dir(self.to_glib_none().0, dir_to_pull.to_glib_none().0, flags.into_glib(), upgrader_flags.into_glib(), progress.to_glib_none().0, out_changed.as_mut_ptr(), cancellable.map(|p| p.as_ref()).to_glib_none().0, &mut error);
             let out_changed = out_changed.assume_init();
             if error.is_null() { Ok(from_glib(out_changed)) } else { Err(from_glib_full(error)) }
         }
     }
 
+    #[doc(alias = "ostree_sysroot_upgrader_set_origin")]
     pub fn set_origin<P: IsA<gio::Cancellable>>(&self, origin: Option<&glib::KeyFile>, cancellable: Option<&P>) -> Result<(), glib::Error> {
         unsafe {
             let mut error = ptr::null_mut();
-            let _ = ostree_sys::ostree_sysroot_upgrader_set_origin(self.to_glib_none().0, origin.to_glib_none().0, cancellable.map(|p| p.as_ref()).to_glib_none().0, &mut error);
+            let _ = ffi::ostree_sysroot_upgrader_set_origin(self.to_glib_none().0, origin.to_glib_none().0, cancellable.map(|p| p.as_ref()).to_glib_none().0, &mut error);
             if error.is_null() { Ok(()) } else { Err(from_glib_full(error)) }
         }
     }
 
-    pub fn get_property_flags(&self) -> SysrootUpgraderFlags {
+    pub fn flags(&self) -> SysrootUpgraderFlags {
         unsafe {
-            let mut value = Value::from_type(<SysrootUpgraderFlags as StaticType>::static_type());
-            gobject_sys::g_object_get_property(self.as_ptr() as *mut gobject_sys::GObject, b"flags\0".as_ptr() as *const _, value.to_glib_none_mut().0);
-            value.get().expect("Return Value for property `flags` getter").unwrap()
+            let mut value = glib::Value::from_type(<SysrootUpgraderFlags as StaticType>::static_type());
+            glib::gobject_ffi::g_object_get_property(self.as_ptr() as *mut glib::gobject_ffi::GObject, b"flags\0".as_ptr() as *const _, value.to_glib_none_mut().0);
+            value.get().expect("Return Value for property `flags` getter")
         }
     }
 
-    pub fn get_property_osname(&self) -> Option<GString> {
+    pub fn osname(&self) -> Option<glib::GString> {
         unsafe {
-            let mut value = Value::from_type(<GString as StaticType>::static_type());
-            gobject_sys::g_object_get_property(self.as_ptr() as *mut gobject_sys::GObject, b"osname\0".as_ptr() as *const _, value.to_glib_none_mut().0);
+            let mut value = glib::Value::from_type(<glib::GString as StaticType>::static_type());
+            glib::gobject_ffi::g_object_get_property(self.as_ptr() as *mut glib::gobject_ffi::GObject, b"osname\0".as_ptr() as *const _, value.to_glib_none_mut().0);
             value.get().expect("Return Value for property `osname` getter")
         }
     }
 
-    pub fn get_property_sysroot(&self) -> Option<Sysroot> {
+    pub fn sysroot(&self) -> Option<Sysroot> {
         unsafe {
-            let mut value = Value::from_type(<Sysroot as StaticType>::static_type());
-            gobject_sys::g_object_get_property(self.as_ptr() as *mut gobject_sys::GObject, b"sysroot\0".as_ptr() as *const _, value.to_glib_none_mut().0);
+            let mut value = glib::Value::from_type(<Sysroot as StaticType>::static_type());
+            glib::gobject_ffi::g_object_get_property(self.as_ptr() as *mut glib::gobject_ffi::GObject, b"sysroot\0".as_ptr() as *const _, value.to_glib_none_mut().0);
             value.get().expect("Return Value for property `sysroot` getter")
         }
     }
 
+    #[doc(alias = "ostree_sysroot_upgrader_check_timestamps")]
     pub fn check_timestamps(repo: &Repo, from_rev: &str, to_rev: &str) -> Result<(), glib::Error> {
         unsafe {
             let mut error = ptr::null_mut();
-            let _ = ostree_sys::ostree_sysroot_upgrader_check_timestamps(repo.to_glib_none().0, from_rev.to_glib_none().0, to_rev.to_glib_none().0, &mut error);
+            let _ = ffi::ostree_sysroot_upgrader_check_timestamps(repo.to_glib_none().0, from_rev.to_glib_none().0, to_rev.to_glib_none().0, &mut error);
             if error.is_null() { Ok(()) } else { Err(from_glib_full(error)) }
         }
     }
@@ -144,6 +154,6 @@ impl SysrootUpgrader {
 
 impl fmt::Display for SysrootUpgrader {
     fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        write!(f, "SysrootUpgrader")
+        f.write_str("SysrootUpgrader")
     }
 }
index 10eb043c2aa9c923cacf1dee2fb495705ba29a31..5a1560025c54a86b7ed6130e1ebb0084287e05f4 100644 (file)
@@ -1,2 +1,2 @@
-Generated by gir (https://github.com/gtk-rs/gir @ 2d1ffab)
-from gir-files (https://github.com/gtk-rs/gir-files @ e4bcf9b+)
+Generated by gir (https://github.com/gtk-rs/gir @ e8f82cf6)
+from gir-files
index 20a04c442b49274188f9b79fa438eaa08cc6942b..83bb44b9c37b779678c712224d5311f9ef487e4a 100644 (file)
@@ -3,7 +3,7 @@ use glib_sys::{g_free, g_malloc0, gpointer};
 use once_cell::sync::OnceCell;
 use std::ptr::copy_nonoverlapping;
 
-const BYTES_LEN: usize = ostree_sys::OSTREE_SHA256_DIGEST_LEN as usize;
+const BYTES_LEN: usize = ffi::OSTREE_SHA256_DIGEST_LEN as usize;
 
 static BASE64_CONFIG: OnceCell<radix64::CustomConfig> = OnceCell::new();
 
@@ -120,10 +120,8 @@ impl Clone for Checksum {
 impl PartialEq for Checksum {
     fn eq(&self, other: &Self) -> bool {
         unsafe {
-            let ret = ostree_sys::ostree_cmp_checksum_bytes(
-                self.bytes as *const u8,
-                other.bytes as *const u8,
-            );
+            let ret =
+                ffi::ostree_cmp_checksum_bytes(self.bytes as *const u8, other.bytes as *const u8);
             ret == 0
         }
     }
index b85a3f4c72e90d1c7a671ce13e6c3fbefd38b425..0fb28deb49253818d781230d3b7adb3051aaee0f 100644 (file)
@@ -1,6 +1,6 @@
+use crate::CollectionRef;
 use glib::translate::ToGlibPtr;
 use std::ffi::CStr;
-use CollectionRef;
 
 trait AsNonnullPtr
 where
index 692c1606db613e8e77bbe5d9ee3e7e245d4a88cc..c6eb2c5eed0a24a72229432715c4108ef650e7dd 100644 (file)
@@ -13,9 +13,9 @@ pub fn checksum_file<P: IsA<gio::File>, Q: IsA<gio::Cancellable>>(
     unsafe {
         let mut out_csum = ptr::null_mut();
         let mut error = ptr::null_mut();
-        let ret = ostree_sys::ostree_checksum_file(
+        let ret = ffi::ostree_checksum_file(
             f.as_ref().to_glib_none().0,
-            objtype.to_glib(),
+            objtype.into_glib(),
             &mut out_csum,
             cancellable.map(|p| p.as_ref()).to_glib_none().0,
             &mut error,
@@ -45,7 +45,7 @@ pub fn checksum_file_async<
     ) {
         let mut error = ptr::null_mut();
         let mut out_csum = MaybeUninit::uninit();
-        let ret = ostree_sys::ostree_checksum_file_async_finish(
+        let ret = ffi::ostree_checksum_file_async_finish(
             _source_object as *mut _,
             res,
             out_csum.as_mut_ptr(),
@@ -58,9 +58,9 @@ pub fn checksum_file_async<
     }
     let callback = checksum_file_async_trampoline::<R>;
     unsafe {
-        ostree_sys::ostree_checksum_file_async(
+        ffi::ostree_checksum_file_async(
             f.as_ref().to_glib_none().0,
-            objtype.to_glib(),
+            objtype.into_glib(),
             io_priority,
             cancellable.map(|p| p.as_ref()).to_glib_none().0,
             Some(callback),
@@ -76,12 +76,10 @@ pub fn checksum_file_async_future<P: IsA<gio::File> + Clone + 'static>(
     io_priority: i32,
 ) -> Pin<Box<dyn Future<Output = Result<Checksum, Box<dyn std::error::Error>>> + 'static>> {
     let f = f.clone();
-    Box::pin(gio::GioFuture::new(&f, move |f, send| {
-        let cancellable = gio::Cancellable::new();
-        checksum_file_async(f, objtype, io_priority, Some(&cancellable), move |res| {
+    Box::pin(gio::GioFuture::new(&f, move |f, cancellable, send| {
+        checksum_file_async(f, objtype, io_priority, Some(cancellable), move |res| {
             send.resolve(res);
         });
-        cancellable
     }))
 }
 
@@ -95,11 +93,11 @@ pub fn checksum_file_from_input<P: IsA<gio::InputStream>, Q: IsA<gio::Cancellabl
     unsafe {
         let mut out_csum = ptr::null_mut();
         let mut error = ptr::null_mut();
-        let ret = ostree_sys::ostree_checksum_file_from_input(
+        let ret = ffi::ostree_checksum_file_from_input(
             file_info.to_glib_none().0,
             xattrs.to_glib_none().0,
             in_.map(|p| p.as_ref()).to_glib_none().0,
-            objtype.to_glib(),
+            objtype.into_glib(),
             &mut out_csum,
             cancellable.map(|p| p.as_ref()).to_glib_none().0,
             &mut error,
@@ -120,14 +118,14 @@ pub fn checksum_file_at<P: IsA<gio::Cancellable>>(
     unsafe {
         let mut out_checksum = ptr::null_mut();
         let mut error = ptr::null_mut();
-        ostree_sys::ostree_checksum_file_at(
+        ffi::ostree_checksum_file_at(
             dfd,
             path.to_glib_none().0,
             stbuf
                 .map(|p| p as *const libc::stat as *mut libc::stat)
                 .unwrap_or(ptr::null_mut()),
-            objtype.to_glib(),
-            flags.to_glib(),
+            objtype.into_glib(),
+            flags.into_glib(),
             &mut out_checksum,
             cancellable.map(|p| p.as_ref()).to_glib_none().0,
             &mut error,
@@ -148,7 +146,7 @@ unsafe fn checksum_file_error(
     if !error.is_null() {
         Err(Box::<glib::Error>::new(from_glib_full(error)))
     } else if ret == GFALSE {
-        Err(Box::new(glib_bool_error!("unknown error")))
+        Err(Box::new(glib::bool_error!("unknown error")))
     } else {
         Ok(Checksum::from_glib_full(out_csum))
     }
index 336f2582f5630a110febd83ef0d934ded08f9643..cca5bc88f24ecafbbd2e9e00ec7bc2fa3c66f104 100644 (file)
@@ -1,3 +1,4 @@
+use ffi::OstreeKernelArgs;
 #[cfg(any(feature = "v2019_3", feature = "dox"))]
 use gio;
 #[cfg(any(feature = "v2019_3", feature = "dox"))]
@@ -5,18 +6,16 @@ use glib::object::IsA;
 use glib::translate::*;
 #[cfg(any(feature = "v2019_3", feature = "dox"))]
 use glib::GString;
-use ostree_sys;
-use ostree_sys::OstreeKernelArgs;
 use std::fmt;
 use std::ptr;
 
-glib_wrapper! {
+glib::wrapper! {
     #[derive(Debug, PartialEq, Eq, PartialOrd, Ord, Hash)]
-    pub struct KernelArgs(Boxed<ostree_sys::OstreeKernelArgs>);
+    pub struct KernelArgs(Boxed<ffi::OstreeKernelArgs>);
 
     match fn {
         copy => |_ptr| unimplemented!(),
-        free => |ptr| ostree_sys::ostree_kernel_args_free(ptr),
+        free => |ptr| ffi::ostree_kernel_args_free(ptr),
     }
 }
 
@@ -24,24 +23,21 @@ impl KernelArgs {
     #[cfg(any(feature = "v2019_3", feature = "dox"))]
     pub fn append(&mut self, arg: &str) {
         unsafe {
-            ostree_sys::ostree_kernel_args_append(self.to_glib_none_mut().0, arg.to_glib_none().0);
+            ffi::ostree_kernel_args_append(self.to_glib_none_mut().0, arg.to_glib_none().0);
         }
     }
 
     #[cfg(any(feature = "v2019_3", feature = "dox"))]
     pub fn append_argv(&mut self, argv: &[&str]) {
         unsafe {
-            ostree_sys::ostree_kernel_args_append_argv(
-                self.to_glib_none_mut().0,
-                argv.to_glib_none().0,
-            );
+            ffi::ostree_kernel_args_append_argv(self.to_glib_none_mut().0, argv.to_glib_none().0);
         }
     }
 
     #[cfg(any(feature = "v2019_3", feature = "dox"))]
     pub fn append_argv_filtered(&mut self, argv: &[&str], prefixes: &[&str]) {
         unsafe {
-            ostree_sys::ostree_kernel_args_append_argv_filtered(
+            ffi::ostree_kernel_args_append_argv_filtered(
                 self.to_glib_none_mut().0,
                 argv.to_glib_none().0,
                 prefixes.to_glib_none().0,
@@ -56,7 +52,7 @@ impl KernelArgs {
     ) -> Result<(), glib::Error> {
         unsafe {
             let mut error = ptr::null_mut();
-            let _ = ostree_sys::ostree_kernel_args_append_proc_cmdline(
+            let _ = ffi::ostree_kernel_args_append_proc_cmdline(
                 self.to_glib_none_mut().0,
                 cancellable.map(|p| p.as_ref()).to_glib_none().0,
                 &mut error,
@@ -72,7 +68,7 @@ impl KernelArgs {
     pub fn delete(&mut self, arg: &str) -> Result<(), glib::Error> {
         unsafe {
             let mut error = ptr::null_mut();
-            let _ = ostree_sys::ostree_kernel_args_delete(
+            let _ = ffi::ostree_kernel_args_delete(
                 self.to_glib_none_mut().0,
                 arg.to_glib_none().0,
                 &mut error,
@@ -89,7 +85,7 @@ impl KernelArgs {
     pub fn delete_key_entry(&mut self, key: &str) -> Result<(), glib::Error> {
         unsafe {
             let mut error = ptr::null_mut();
-            let _ = ostree_sys::ostree_kernel_args_delete_key_entry(
+            let _ = ffi::ostree_kernel_args_delete_key_entry(
                 self.to_glib_none_mut().0,
                 key.to_glib_none().0,
                 &mut error,
@@ -105,7 +101,7 @@ impl KernelArgs {
     #[cfg(any(feature = "v2019_3", feature = "dox"))]
     pub fn get_last_value(&self, key: &str) -> Option<GString> {
         unsafe {
-            from_glib_none(ostree_sys::ostree_kernel_args_get_last_value(
+            from_glib_none(ffi::ostree_kernel_args_get_last_value(
                 self.to_glib_none().0 as *mut OstreeKernelArgs,
                 key.to_glib_none().0,
             ))
@@ -116,7 +112,7 @@ impl KernelArgs {
     pub fn new_replace(&mut self, arg: &str) -> Result<(), glib::Error> {
         unsafe {
             let mut error = ptr::null_mut();
-            let _ = ostree_sys::ostree_kernel_args_new_replace(
+            let _ = ffi::ostree_kernel_args_new_replace(
                 self.to_glib_none_mut().0,
                 arg.to_glib_none().0,
                 &mut error,
@@ -132,7 +128,7 @@ impl KernelArgs {
     #[cfg(any(feature = "v2019_3", feature = "dox"))]
     pub fn parse_append(&mut self, options: &str) {
         unsafe {
-            ostree_sys::ostree_kernel_args_parse_append(
+            ffi::ostree_kernel_args_parse_append(
                 self.to_glib_none_mut().0,
                 options.to_glib_none().0,
             );
@@ -142,34 +138,28 @@ impl KernelArgs {
     #[cfg(any(feature = "v2019_3", feature = "dox"))]
     pub fn replace(&mut self, arg: &str) {
         unsafe {
-            ostree_sys::ostree_kernel_args_replace(self.to_glib_none_mut().0, arg.to_glib_none().0);
+            ffi::ostree_kernel_args_replace(self.to_glib_none_mut().0, arg.to_glib_none().0);
         }
     }
 
     #[cfg(any(feature = "v2019_3", feature = "dox"))]
     pub fn replace_argv(&mut self, argv: &[&str]) {
         unsafe {
-            ostree_sys::ostree_kernel_args_replace_argv(
-                self.to_glib_none_mut().0,
-                argv.to_glib_none().0,
-            );
+            ffi::ostree_kernel_args_replace_argv(self.to_glib_none_mut().0, argv.to_glib_none().0);
         }
     }
 
     #[cfg(any(feature = "v2019_3", feature = "dox"))]
     pub fn replace_take(&mut self, arg: &str) {
         unsafe {
-            ostree_sys::ostree_kernel_args_replace_take(
-                self.to_glib_none_mut().0,
-                arg.to_glib_full(),
-            );
+            ffi::ostree_kernel_args_replace_take(self.to_glib_none_mut().0, arg.to_glib_full());
         }
     }
 
     #[cfg(any(feature = "v2019_3", feature = "dox"))]
     fn to_gstring(&self) -> GString {
         unsafe {
-            from_glib_full(ostree_sys::ostree_kernel_args_to_string(
+            from_glib_full(ffi::ostree_kernel_args_to_string(
                 self.to_glib_none().0 as *mut OstreeKernelArgs,
             ))
         }
@@ -178,7 +168,7 @@ impl KernelArgs {
     #[cfg(any(feature = "v2019_3", feature = "dox"))]
     pub fn to_strv(&self) -> Vec<GString> {
         unsafe {
-            FromGlibPtrContainer::from_glib_full(ostree_sys::ostree_kernel_args_to_strv(
+            FromGlibPtrContainer::from_glib_full(ffi::ostree_kernel_args_to_strv(
                 self.to_glib_none().0 as *mut OstreeKernelArgs,
             ))
         }
@@ -190,7 +180,7 @@ impl KernelArgs {
     #[cfg(any(feature = "v2019_3", feature = "dox"))]
     pub fn from_string(options: &str) -> KernelArgs {
         unsafe {
-            from_glib_full(ostree_sys::ostree_kernel_args_from_string(
+            from_glib_full(ffi::ostree_kernel_args_from_string(
                 options.to_glib_none().0,
             ))
         }
@@ -198,7 +188,7 @@ impl KernelArgs {
 
     #[cfg(any(feature = "v2019_3", feature = "dox"))]
     pub fn new() -> KernelArgs {
-        unsafe { from_glib_full(ostree_sys::ostree_kernel_args_new()) }
+        unsafe { from_glib_full(ffi::ostree_kernel_args_new()) }
     }
 }
 
index d17bddd16afdb9bb918d7a8889b395b7e7321fa9..78f4a0018740eb69db0abd2b416320a104896d0e 100644 (file)
@@ -6,21 +6,6 @@
 
 #![doc(html_root_url = "https://fkrull.gitlab.io/ostree-rs")]
 
-extern crate gio_sys;
-extern crate glib_sys;
-extern crate gobject_sys;
-extern crate ostree_sys;
-#[macro_use]
-extern crate glib;
-extern crate gio;
-extern crate libc;
-#[macro_use]
-extern crate bitflags;
-extern crate hex;
-extern crate once_cell;
-extern crate radix64;
-extern crate thiserror;
-
 // code generated by gir
 #[rustfmt::skip]
 #[allow(clippy::all)]
index 098c7f9add2f2a3f71fa1ca1e23b37b022312a5d..9064de358c0bae90879202eca56d9ca66a647aa6 100644 (file)
@@ -1,18 +1,17 @@
+use crate::ObjectType;
 use crate::{object_name_deserialize, object_name_serialize, object_to_string};
 use glib;
 use glib::translate::*;
 use glib::GString;
 use glib_sys;
-use ostree_sys;
 use std::fmt::Display;
 use std::fmt::Error;
 use std::fmt::Formatter;
 use std::hash::Hash;
 use std::hash::Hasher;
-use ObjectType;
 
 fn hash_object_name(v: &glib::Variant) -> u32 {
-    unsafe { ostree_sys::ostree_hash_object_name(v.to_glib_none().0 as glib_sys::gconstpointer) }
+    unsafe { ffi::ostree_hash_object_name(v.to_glib_none().0 as glib_sys::gconstpointer) }
 }
 
 /// A reference to an object in an OSTree repo. It contains both a checksum and an
index 298c4b4ba1bc38e109f0acf67f1a1d972f3ca102..4b683716ed8a4a37db13a907e23da226a93089d2 100644 (file)
@@ -1,10 +1,10 @@
 #[cfg(any(feature = "v2016_4", feature = "dox"))]
 use crate::RepoListRefsExtFlags;
 use crate::{Checksum, ObjectName, ObjectType, Repo};
+use ffi;
 use gio_sys;
 use glib::{self, translate::*, Error, IsA};
 use glib_sys;
-use ostree_sys;
 use std::{
     collections::{HashMap, HashSet},
     future::Future,
@@ -38,7 +38,7 @@ unsafe fn from_glib_container_variant_set(ptr: *mut glib_sys::GHashTable) -> Has
 impl Repo {
     /// Create a new `Repo` object for working with an OSTree repo at the given path.
     pub fn new_for_path<P: AsRef<Path>>(path: P) -> Repo {
-        Repo::new(&gio::File::new_for_path(path.as_ref()))
+        Repo::new(&gio::File::for_path(path.as_ref()))
     }
 
     pub fn traverse_commit<P: IsA<gio::Cancellable>>(
@@ -50,7 +50,7 @@ impl Repo {
         unsafe {
             let mut error = ptr::null_mut();
             let mut hashtable = ptr::null_mut();
-            let _ = ostree_sys::ostree_repo_traverse_commit(
+            let _ = ffi::ostree_repo_traverse_commit(
                 self.to_glib_none().0,
                 commit_checksum.to_glib_none().0,
                 maxdepth,
@@ -74,7 +74,7 @@ impl Repo {
         unsafe {
             let mut error = ptr::null_mut();
             let mut hashtable = ptr::null_mut();
-            let _ = ostree_sys::ostree_repo_list_refs(
+            let _ = ffi::ostree_repo_list_refs(
                 self.to_glib_none().0,
                 refspec_prefix.to_glib_none().0,
                 &mut hashtable,
@@ -100,11 +100,11 @@ impl Repo {
         unsafe {
             let mut error = ptr::null_mut();
             let mut hashtable = ptr::null_mut();
-            let _ = ostree_sys::ostree_repo_list_refs_ext(
+            let _ = ffi::ostree_repo_list_refs_ext(
                 self.to_glib_none().0,
                 refspec_prefix.to_glib_none().0,
                 &mut hashtable,
-                flags.to_glib(),
+                flags.into_glib(),
                 cancellable.map(AsRef::as_ref).to_glib_none().0,
                 &mut error,
             );
@@ -127,7 +127,7 @@ impl Repo {
         unsafe {
             let mut error = ptr::null_mut();
             let mut out_csum = ptr::null_mut();
-            let _ = ostree_sys::ostree_repo_write_content(
+            let _ = ffi::ostree_repo_write_content(
                 self.to_glib_none().0,
                 expected_checksum.to_glib_none().0,
                 object_input.as_ref().to_glib_none().0,
@@ -154,9 +154,9 @@ impl Repo {
         unsafe {
             let mut error = ptr::null_mut();
             let mut out_csum = ptr::null_mut();
-            let _ = ostree_sys::ostree_repo_write_metadata(
+            let _ = ffi::ostree_repo_write_metadata(
                 self.to_glib_none().0,
-                objtype.to_glib(),
+                objtype.into_glib(),
                 expected_checksum.to_glib_none().0,
                 object.to_glib_none().0,
                 &mut out_csum,
@@ -193,7 +193,7 @@ impl Repo {
         ) {
             let mut error = ptr::null_mut();
             let mut out_csum = MaybeUninit::uninit();
-            let _ = ostree_sys::ostree_repo_write_content_finish(
+            let _ = ffi::ostree_repo_write_content_finish(
                 _source_object as *mut _,
                 res,
                 out_csum.as_mut_ptr(),
@@ -210,7 +210,7 @@ impl Repo {
         }
         let callback = write_content_async_trampoline::<R>;
         unsafe {
-            ostree_sys::ostree_repo_write_content_async(
+            ffi::ostree_repo_write_content_async(
                 self.to_glib_none().0,
                 expected_checksum.to_glib_none().0,
                 object.as_ref().to_glib_none().0,
@@ -230,20 +230,18 @@ impl Repo {
     ) -> Pin<Box<dyn Future<Output = Result<Checksum, Error>> + 'static>> {
         let expected_checksum = expected_checksum.map(ToOwned::to_owned);
         let object = object.clone();
-        Box::pin(gio::GioFuture::new(self, move |obj, send| {
-            let cancellable = gio::Cancellable::new();
+        Box::pin(gio::GioFuture::new(self, move |obj, cancellable, send| {
             obj.write_content_async(
                 expected_checksum
                     .as_ref()
                     .map(::std::borrow::Borrow::borrow),
                 &object,
                 length,
-                Some(&cancellable),
+                Some(cancellable),
                 move |res| {
                     send.resolve(res);
                 },
             );
-            cancellable
         }))
     }
 
@@ -268,7 +266,7 @@ impl Repo {
         ) {
             let mut error = ptr::null_mut();
             let mut out_csum = MaybeUninit::uninit();
-            let _ = ostree_sys::ostree_repo_write_metadata_finish(
+            let _ = ffi::ostree_repo_write_metadata_finish(
                 _source_object as *mut _,
                 res,
                 out_csum.as_mut_ptr(),
@@ -285,9 +283,9 @@ impl Repo {
         }
         let callback = write_metadata_async_trampoline::<Q>;
         unsafe {
-            ostree_sys::ostree_repo_write_metadata_async(
+            ffi::ostree_repo_write_metadata_async(
                 self.to_glib_none().0,
-                objtype.to_glib(),
+                objtype.into_glib(),
                 expected_checksum.to_glib_none().0,
                 object.to_glib_none().0,
                 cancellable.map(|p| p.as_ref()).to_glib_none().0,
@@ -305,20 +303,18 @@ impl Repo {
     ) -> Pin<Box<dyn Future<Output = Result<Checksum, Error>> + 'static>> {
         let expected_checksum = expected_checksum.map(ToOwned::to_owned);
         let object = object.clone();
-        Box::pin(gio::GioFuture::new(self, move |obj, send| {
-            let cancellable = gio::Cancellable::new();
+        Box::pin(gio::GioFuture::new(self, move |obj, cancellable, send| {
             obj.write_metadata_async(
                 objtype,
                 expected_checksum
                     .as_ref()
                     .map(::std::borrow::Borrow::borrow),
                 &object,
-                Some(&cancellable),
+                Some(cancellable),
                 move |res| {
                     send.resolve(res);
                 },
             );
-            cancellable
         }))
     }
 }
index 7d92e5461f15c7c20c41be6468094f5cb883704f..30ac8cf62ce45390ba3f701e946b6675a156232a 100644 (file)
@@ -1,7 +1,6 @@
 use crate::{RepoCheckoutMode, RepoCheckoutOverwriteMode, RepoDevInoCache, SePolicy};
 use glib::translate::*;
 use libc::c_char;
-use ostree_sys::*;
 use std::path::PathBuf;
 
 #[cfg(any(feature = "v2018_2", feature = "dox"))]
@@ -69,45 +68,46 @@ impl Default for RepoCheckoutAtOptions {
 type StringStash<'a, T> = Stash<'a, *const c_char, Option<T>>;
 type WrapperStash<'a, GlibT, WrappedT> = Stash<'a, *mut GlibT, Option<WrappedT>>;
 
-impl<'a> ToGlibPtr<'a, *const OstreeRepoCheckoutAtOptions> for RepoCheckoutAtOptions {
+impl<'a> ToGlibPtr<'a, *const ffi::OstreeRepoCheckoutAtOptions> for RepoCheckoutAtOptions {
     #[allow(clippy::type_complexity)]
     type Storage = (
-        Box<OstreeRepoCheckoutAtOptions>,
+        Box<ffi::OstreeRepoCheckoutAtOptions>,
         StringStash<'a, PathBuf>,
         StringStash<'a, String>,
-        WrapperStash<'a, OstreeRepoDevInoCache, RepoDevInoCache>,
-        WrapperStash<'a, OstreeSePolicy, SePolicy>,
+        WrapperStash<'a, ffi::OstreeRepoDevInoCache, RepoDevInoCache>,
+        WrapperStash<'a, ffi::OstreeSePolicy, SePolicy>,
     );
 
     // We need to make sure that all memory pointed to by the returned pointer is kept alive by
     // either the `self` reference or the returned Stash.
-    fn to_glib_none(&'a self) -> Stash<*const OstreeRepoCheckoutAtOptions, Self> {
+    fn to_glib_none(&'a self) -> Stash<*const ffi::OstreeRepoCheckoutAtOptions, Self> {
         // Creating this struct from zeroed memory is fine since it's `repr(C)` and only contains
         // primitive types. In fact, the libostree docs say to zero the struct. This means we handle
         // the unused bytes correctly.
         // The struct needs to be boxed so the pointer we return remains valid even as the Stash is
         // moved around.
-        let mut options = Box::new(unsafe { std::mem::zeroed::<OstreeRepoCheckoutAtOptions>() });
-        options.mode = self.mode.to_glib();
-        options.overwrite_mode = self.overwrite_mode.to_glib();
-        options.enable_uncompressed_cache = self.enable_uncompressed_cache.to_glib();
-        options.enable_fsync = self.enable_fsync.to_glib();
-        options.process_whiteouts = self.process_whiteouts.to_glib();
-        options.no_copy_fallback = self.no_copy_fallback.to_glib();
+        let mut options =
+            Box::new(unsafe { std::mem::zeroed::<ffi::OstreeRepoCheckoutAtOptions>() });
+        options.mode = self.mode.into_glib();
+        options.overwrite_mode = self.overwrite_mode.into_glib();
+        options.enable_uncompressed_cache = self.enable_uncompressed_cache.into_glib();
+        options.enable_fsync = self.enable_fsync.into_glib();
+        options.process_whiteouts = self.process_whiteouts.into_glib();
+        options.no_copy_fallback = self.no_copy_fallback.into_glib();
 
         #[cfg(feature = "v2017_6")]
         {
-            options.force_copy = self.force_copy.to_glib();
+            options.force_copy = self.force_copy.into_glib();
         }
 
         #[cfg(feature = "v2017_7")]
         {
-            options.bareuseronly_dirs = self.bareuseronly_dirs.to_glib();
+            options.bareuseronly_dirs = self.bareuseronly_dirs.into_glib();
         }
 
         #[cfg(feature = "v2018_9")]
         {
-            options.force_copy_zerosized = self.force_copy_zerosized.to_glib();
+            options.force_copy_zerosized = self.force_copy_zerosized.into_glib();
         }
 
         // We keep these complex values alive by returning them in our Stash. Technically, some of
@@ -162,8 +162,11 @@ mod tests {
         let stash = options.to_glib_none();
         let ptr = stash.0;
         unsafe {
-            assert_eq!((*ptr).mode, OSTREE_REPO_CHECKOUT_MODE_NONE);
-            assert_eq!((*ptr).overwrite_mode, OSTREE_REPO_CHECKOUT_OVERWRITE_NONE);
+            assert_eq!((*ptr).mode, ffi::OSTREE_REPO_CHECKOUT_MODE_NONE);
+            assert_eq!(
+                (*ptr).overwrite_mode,
+                ffi::OSTREE_REPO_CHECKOUT_OVERWRITE_NONE
+            );
             assert_eq!((*ptr).enable_uncompressed_cache, GFALSE);
             assert_eq!((*ptr).enable_fsync, GFALSE);
             assert_eq!((*ptr).process_whiteouts, GFALSE);
@@ -212,17 +215,17 @@ mod tests {
             }),
             #[cfg(feature = "v2017_6")]
             sepolicy: Some(
-                SePolicy::new(&gio::File::new_for_path("a/b"), gio::NONE_CANCELLABLE).unwrap(),
+                SePolicy::new(&gio::File::for_path("a/b"), gio::NONE_CANCELLABLE).unwrap(),
             ),
             sepolicy_prefix: Some("prefix".into()),
         };
         let stash = options.to_glib_none();
         let ptr = stash.0;
         unsafe {
-            assert_eq!((*ptr).mode, OSTREE_REPO_CHECKOUT_MODE_USER);
+            assert_eq!((*ptr).mode, ffi::OSTREE_REPO_CHECKOUT_MODE_USER);
             assert_eq!(
                 (*ptr).overwrite_mode,
-                OSTREE_REPO_CHECKOUT_OVERWRITE_UNION_IDENTICAL
+                ffi::OSTREE_REPO_CHECKOUT_OVERWRITE_UNION_IDENTICAL
             );
             assert_eq!((*ptr).enable_uncompressed_cache, GTRUE);
             assert_eq!((*ptr).enable_fsync, GTRUE);
index fc62267eed2e90f25f6c389f4b48bd4c5900db27..6f193b6679004c3d10da2d2a12cb0066414bd539 100644 (file)
@@ -2,7 +2,6 @@ use crate::{Repo, RepoCheckoutFilterResult};
 use glib::translate::*;
 use glib_sys::gpointer;
 use libc::c_char;
-use ostree_sys::*;
 use std::any::Any;
 use std::panic::catch_unwind;
 use std::path::{Path, PathBuf};
@@ -65,11 +64,11 @@ impl FromGlibPtrNone<gpointer> for &RepoCheckoutFilter {
 /// # Panics
 /// If any parameter is a null pointer, the function panics.
 unsafe fn filter_trampoline(
-    repo: *mut OstreeRepo,
+    repo: *mut ffi::OstreeRepo,
     path: *const c_char,
     stat: *mut libc::stat,
     user_data: gpointer,
-) -> OstreeRepoCheckoutFilterResult {
+) -> ffi::OstreeRepoCheckoutFilterResult {
     // We can't guarantee it's a valid pointer, but we can make sure it's not null.
     assert!(!stat.is_null());
     let stat = &*stat;
@@ -83,17 +82,17 @@ unsafe fn filter_trampoline(
     let path: PathBuf = from_glib_none(path);
 
     let result = closure.call(&repo, &path, stat);
-    result.to_glib()
+    result.into_glib()
 }
 
 /// Unwind-safe trampoline to call the Rust filter callback. See [filter_trampoline](fn.filter_trampoline.html).
 /// This function additionally catches panics and aborts to avoid unwinding into C code.
 pub(super) unsafe extern "C" fn filter_trampoline_unwindsafe(
-    repo: *mut OstreeRepo,
+    repo: *mut ffi::OstreeRepo,
     path: *const c_char,
     stat: *mut libc::stat,
     user_data: gpointer,
-) -> OstreeRepoCheckoutFilterResult {
+) -> ffi::OstreeRepoCheckoutFilterResult {
     // Unwinding across an FFI boundary is Undefined Behavior and we have no other way to communicate
     // the error. We abort() safely to avoid further problems.
     let result = catch_unwind(move || filter_trampoline(repo, path, stat, user_data));
@@ -213,6 +212,6 @@ mod tests {
                 filter.to_glib_none().0,
             )
         };
-        assert_eq!(result, OSTREE_REPO_CHECKOUT_FILTER_SKIP);
+        assert_eq!(result, ffi::OSTREE_REPO_CHECKOUT_FILTER_SKIP);
     }
 }
index 578b429bc6492a6f61286d1b9cd64b7008671068..aa587b1d64e48f2d1c85e816eaeb6c1083df46a3 100644 (file)
@@ -1,17 +1,16 @@
 use gobject_sys;
-use ostree_sys;
 
-glib_wrapper! {
+glib::wrapper! {
     /// A list of statistics for each transaction that may be interesting for reporting purposes.
     #[derive(Debug, PartialEq, Eq, PartialOrd, Ord, Hash)]
-    pub struct RepoTransactionStats(Boxed<ostree_sys::OstreeRepoTransactionStats>);
+    pub struct RepoTransactionStats(Boxed<ffi::OstreeRepoTransactionStats>);
 
     match fn {
-        copy => |ptr| gobject_sys::g_boxed_copy(ostree_sys::ostree_repo_transaction_stats_get_type(), ptr as *mut _) as *mut ostree_sys::OstreeRepoTransactionStats,
-        free => |ptr| gobject_sys::g_boxed_free(ostree_sys::ostree_repo_transaction_stats_get_type(), ptr as *mut _),
+        copy => |ptr| gobject_sys::g_boxed_copy(ffi::ostree_repo_transaction_stats_get_type(), ptr as *mut _) as *mut ffi::OstreeRepoTransactionStats,
+        free => |ptr| gobject_sys::g_boxed_free(ffi::ostree_repo_transaction_stats_get_type(), ptr as *mut _),
         init => |_ptr| (),
         clear => |_ptr| (),
-        get_type => || ostree_sys::ostree_repo_transaction_stats_get_type(),
+        type_ => || ffi::ostree_repo_transaction_stats_get_type(),
     }
 }
 
index cef15094a2b18fb27a9d4d9f74bc894e8dd08442..6ec9cfe166e191a1baef340fa389c55a66d98e83 100644 (file)
@@ -4,7 +4,7 @@ use std::ptr;
 impl SePolicy {
     pub fn fscreatecon_cleanup() {
         unsafe {
-            ostree_sys::ostree_sepolicy_fscreatecon_cleanup(ptr::null_mut());
+            ffi::ostree_sepolicy_fscreatecon_cleanup(ptr::null_mut());
         }
     }
 }
index 1fed6026d358dbf69a500f242c8044bca2287e2d..b797cc68aad7919d9b405430aae6da0979b94697 100644 (file)
@@ -1,6 +1,6 @@
+use ffi::OstreeSysrootDeployTreeOpts;
 use glib::translate::*;
 use libc::c_char;
-use ostree_sys::OstreeSysrootDeployTreeOpts;
 
 pub struct SysrootDeployTreeOpts<'a> {
     pub override_kernel_argv: Option<&'a [&'a str]>,
index 9c053b207c0eb1d9754f1b356481f501b51c7bdc..9d2e024b61247ad09042a8d9488536ce421e555f 100644 (file)
@@ -1,5 +1,5 @@
+use ffi::OstreeSysrootWriteDeploymentsOpts;
 use glib::translate::*;
-use ostree_sys::OstreeSysrootWriteDeploymentsOpts;
 
 pub struct SysrootWriteDeploymentsOpts {
     pub do_postclean: bool,
@@ -23,7 +23,7 @@ impl<'a> ToGlibPtr<'a, *const OstreeSysrootWriteDeploymentsOpts> for SysrootWrit
         // moved around.
         let mut options =
             Box::new(unsafe { std::mem::zeroed::<OstreeSysrootWriteDeploymentsOpts>() });
-        options.do_postclean = self.do_postclean.to_glib();
+        options.do_postclean = self.do_postclean.into_glib();
         Stash(options.as_ref(), options)
     }
 }
index 24b69d7d00d04a206076c2c3c932734d2a4f2dc6..602947045ea98b9156de9a2b3486a89323fa7f9a 100644 (file)
@@ -2,12 +2,12 @@
 repository = "fkrull/ostree-rs"
 
 [build-dependencies]
-system-deps = "1.3"
+system-deps = "3"
 
 [dependencies]
-gio-sys = "0.10.0"
-glib-sys = "0.10.0"
-gobject-sys = "0.10.0"
+glib-sys = "0.14.0"
+gobject-sys = "0.14.0"
+gio-sys = "0.14.0"
 libc = "0.2"
 
 [dev-dependencies]
@@ -71,49 +71,126 @@ links = "ostree-1"
 name = "ostree-sys"
 repository = "https://gitlab.com/fkrull/ostree-rs"
 version = "0.7.3"
+edition = "2018"
 [package.metadata.docs.rs]
 features = ["dox"]
 [package.metadata.system-deps.ostree_1]
 name = "ostree-1"
 version = "0.0"
 
-[package.metadata.system-deps.ostree_1.feature-versions]
-v2014_9 = "2014.9"
-v2015_7 = "2015.7"
-v2016_3 = "2016.3"
-v2016_4 = "2016.4"
-v2016_5 = "2016.5"
-v2016_6 = "2016.6"
-v2016_7 = "2016.7"
-v2016_8 = "2016.8"
-v2016_14 = "2016.14"
-v2017_1 = "2017.1"
-v2017_2 = "2017.2"
-v2017_3 = "2017.3"
-v2017_4 = "2017.4"
-v2017_6 = "2017.6"
-v2017_7 = "2017.7"
-v2017_8 = "2017.8"
-v2017_9 = "2017.9"
-v2017_10 = "2017.10"
-v2017_11 = "2017.11"
-v2017_12 = "2017.12"
-v2017_13 = "2017.13"
-v2017_15 = "2017.15"
-v2018_2 = "2018.2"
-v2018_3 = "2018.3"
-v2018_5 = "2018.5"
-v2018_6 = "2018.6"
-v2018_7 = "2018.7"
-v2018_9 = "2018.9"
-v2019_2 = "2019.2"
-v2019_3 = "2019.3"
-v2019_4 = "2019.4"
-v2019_6 = "2019.6"
-v2020_1 = "2020.1"
-v2020_2 = "2020.2"
-v2020_4 = "2020.4"
-v2020_7 = "2020.7"
-v2020_8 = "2020.8"
-v2021_1 = "2021.1"
-v2021_2 = "2021.2"
+[package.metadata.system-deps.ostree_1.v2014_9]
+version = "2014.9"
+
+[package.metadata.system-deps.ostree_1.v2015_7]
+version = "2015.7"
+
+[package.metadata.system-deps.ostree_1.v2016_3]
+version = "2016.3"
+
+[package.metadata.system-deps.ostree_1.v2016_4]
+version = "2016.4"
+
+[package.metadata.system-deps.ostree_1.v2016_5]
+version = "2016.5"
+
+[package.metadata.system-deps.ostree_1.v2016_6]
+version = "2016.6"
+
+[package.metadata.system-deps.ostree_1.v2016_7]
+version = "2016.7"
+
+[package.metadata.system-deps.ostree_1.v2016_8]
+version = "2016.8"
+
+[package.metadata.system-deps.ostree_1.v2016_14]
+version = "2016.14"
+
+[package.metadata.system-deps.ostree_1.v2017_1]
+version = "2017.1"
+
+[package.metadata.system-deps.ostree_1.v2017_2]
+version = "2017.2"
+
+[package.metadata.system-deps.ostree_1.v2017_3]
+version = "2017.3"
+
+[package.metadata.system-deps.ostree_1.v2017_4]
+version = "2017.4"
+
+[package.metadata.system-deps.ostree_1.v2017_6]
+version = "2017.6"
+
+[package.metadata.system-deps.ostree_1.v2017_7]
+version = "2017.7"
+
+[package.metadata.system-deps.ostree_1.v2017_8]
+version = "2017.8"
+
+[package.metadata.system-deps.ostree_1.v2017_9]
+version = "2017.9"
+
+[package.metadata.system-deps.ostree_1.v2017_10]
+version = "2017.10"
+
+[package.metadata.system-deps.ostree_1.v2017_11]
+version = "2017.11"
+
+[package.metadata.system-deps.ostree_1.v2017_12]
+version = "2017.12"
+
+[package.metadata.system-deps.ostree_1.v2017_13]
+version = "2017.13"
+
+[package.metadata.system-deps.ostree_1.v2017_15]
+version = "2017.15"
+
+[package.metadata.system-deps.ostree_1.v2018_2]
+version = "2018.2"
+
+[package.metadata.system-deps.ostree_1.v2018_3]
+version = "2018.3"
+
+[package.metadata.system-deps.ostree_1.v2018_5]
+version = "2018.5"
+
+[package.metadata.system-deps.ostree_1.v2018_6]
+version = "2018.6"
+
+[package.metadata.system-deps.ostree_1.v2018_7]
+version = "2018.7"
+
+[package.metadata.system-deps.ostree_1.v2018_9]
+version = "2018.9"
+
+[package.metadata.system-deps.ostree_1.v2019_2]
+version = "2019.2"
+
+[package.metadata.system-deps.ostree_1.v2019_3]
+version = "2019.3"
+
+[package.metadata.system-deps.ostree_1.v2019_4]
+version = "2019.4"
+
+[package.metadata.system-deps.ostree_1.v2019_6]
+version = "2019.6"
+
+[package.metadata.system-deps.ostree_1.v2020_1]
+version = "2020.1"
+
+[package.metadata.system-deps.ostree_1.v2020_2]
+version = "2020.2"
+
+[package.metadata.system-deps.ostree_1.v2020_4]
+version = "2020.4"
+
+[package.metadata.system-deps.ostree_1.v2020_7]
+version = "2020.7"
+
+[package.metadata.system-deps.ostree_1.v2020_8]
+version = "2020.8"
+
+[package.metadata.system-deps.ostree_1.v2021_1]
+version = "2021.1"
+
+[package.metadata.system-deps.ostree_1.v2021_2]
+version = "2021.2"
index f4c4e7c7d4eb623b3a89b9a0b6e5092b93e8e158..8c0c4a3a4a3368977bc98b9453bb9308a875486d 100644 (file)
@@ -1,10 +1,7 @@
 // This file was generated by gir (https://github.com/gtk-rs/gir)
-// from gir-files (https://github.com/gtk-rs/gir-files)
+// from gir-files
 // DO NOT EDIT
 
-#[cfg(not(feature = "dox"))]
-extern crate system_deps;
-
 #[cfg(not(feature = "dox"))]
 use std::process;
 
@@ -14,7 +11,7 @@ fn main() {} // prevent linking libraries to avoid documentation failure
 #[cfg(not(feature = "dox"))]
 fn main() {
     if let Err(s) = system_deps::Config::new().probe() {
-        let _ = eprintln!("{}", s);
+        println!("cargo:warning={}", s);
         process::exit(1);
     }
 }
index 10eb043c2aa9c923cacf1dee2fb495705ba29a31..5a1560025c54a86b7ed6130e1ebb0084287e05f4 100644 (file)
@@ -1,2 +1,2 @@
-Generated by gir (https://github.com/gtk-rs/gir @ 2d1ffab)
-from gir-files (https://github.com/gtk-rs/gir-files @ e4bcf9b+)
+Generated by gir (https://github.com/gtk-rs/gir @ e8f82cf6)
+from gir-files
index 1fd721e56ec41c66f490fda8854e866937948b05..0470d0565b409026f1c997d79f8151fb0d41cad5 100644 (file)
@@ -1,23 +1,29 @@
 // This file was generated by gir (https://github.com/gtk-rs/gir)
-// from gir-files (https://github.com/gtk-rs/gir-files)
+// from gir-files
 // DO NOT EDIT
 
 #![allow(non_camel_case_types, non_upper_case_globals, non_snake_case)]
-#![allow(clippy::approx_constant, clippy::type_complexity, clippy::unreadable_literal)]
-
-extern crate libc;
-extern crate glib_sys as glib;
-extern crate gobject_sys as gobject;
-extern crate gio_sys as gio;
+#![allow(
+    clippy::approx_constant,
+    clippy::type_complexity,
+    clippy::unreadable_literal,
+    clippy::upper_case_acronyms
+)]
+#![cfg_attr(feature = "dox", feature(doc_cfg))]
+
+use gio_sys as gio;
+use glib_sys as glib;
+use gobject_sys as gobject;
 
 mod manual;
 
 pub use manual::*;
 
 #[allow(unused_imports)]
-use libc::{c_int, c_char, c_uchar, c_float, c_uint, c_double,
-    c_short, c_ushort, c_long, c_ulong,
-    c_void, size_t, ssize_t, intptr_t, uintptr_t, time_t, FILE};
+use libc::{
+    c_char, c_double, c_float, c_int, c_long, c_short, c_uchar, c_uint, c_ulong, c_ushort, c_void,
+    intptr_t, size_t, ssize_t, time_t, uintptr_t, FILE,
+};
 
 #[allow(unused_imports)]
 use glib::{gboolean, gconstpointer, gpointer, GType};
@@ -113,30 +119,48 @@ pub type OstreeStaticDeltaIndexFlags = c_int;
 pub const OSTREE_STATIC_DELTA_INDEX_FLAGS_NONE: OstreeStaticDeltaIndexFlags = 0;
 
 // Constants
-pub const OSTREE_COMMIT_GVARIANT_STRING: *const c_char = b"(a{sv}aya(say)sstayay)\0" as *const u8 as *const c_char;
-pub const OSTREE_COMMIT_META_KEY_ARCHITECTURE: *const c_char = b"ostree.architecture\0" as *const u8 as *const c_char;
-pub const OSTREE_COMMIT_META_KEY_COLLECTION_BINDING: *const c_char = b"ostree.collection-binding\0" as *const u8 as *const c_char;
-pub const OSTREE_COMMIT_META_KEY_ENDOFLIFE: *const c_char = b"ostree.endoflife\0" as *const u8 as *const c_char;
-pub const OSTREE_COMMIT_META_KEY_ENDOFLIFE_REBASE: *const c_char = b"ostree.endoflife-rebase\0" as *const u8 as *const c_char;
-pub const OSTREE_COMMIT_META_KEY_REF_BINDING: *const c_char = b"ostree.ref-binding\0" as *const u8 as *const c_char;
-pub const OSTREE_COMMIT_META_KEY_SOURCE_TITLE: *const c_char = b"ostree.source-title\0" as *const u8 as *const c_char;
-pub const OSTREE_COMMIT_META_KEY_VERSION: *const c_char = b"version\0" as *const u8 as *const c_char;
-pub const OSTREE_DIRMETA_GVARIANT_STRING: *const c_char = b"(uuua(ayay))\0" as *const u8 as *const c_char;
-pub const OSTREE_FILEMETA_GVARIANT_STRING: *const c_char = b"(uuua(ayay))\0" as *const u8 as *const c_char;
+pub const OSTREE_COMMIT_GVARIANT_STRING: *const c_char =
+    b"(a{sv}aya(say)sstayay)\0" as *const u8 as *const c_char;
+pub const OSTREE_COMMIT_META_KEY_ARCHITECTURE: *const c_char =
+    b"ostree.architecture\0" as *const u8 as *const c_char;
+pub const OSTREE_COMMIT_META_KEY_COLLECTION_BINDING: *const c_char =
+    b"ostree.collection-binding\0" as *const u8 as *const c_char;
+pub const OSTREE_COMMIT_META_KEY_ENDOFLIFE: *const c_char =
+    b"ostree.endoflife\0" as *const u8 as *const c_char;
+pub const OSTREE_COMMIT_META_KEY_ENDOFLIFE_REBASE: *const c_char =
+    b"ostree.endoflife-rebase\0" as *const u8 as *const c_char;
+pub const OSTREE_COMMIT_META_KEY_REF_BINDING: *const c_char =
+    b"ostree.ref-binding\0" as *const u8 as *const c_char;
+pub const OSTREE_COMMIT_META_KEY_SOURCE_TITLE: *const c_char =
+    b"ostree.source-title\0" as *const u8 as *const c_char;
+pub const OSTREE_COMMIT_META_KEY_VERSION: *const c_char =
+    b"version\0" as *const u8 as *const c_char;
+pub const OSTREE_DIRMETA_GVARIANT_STRING: *const c_char =
+    b"(uuua(ayay))\0" as *const u8 as *const c_char;
+pub const OSTREE_FILEMETA_GVARIANT_STRING: *const c_char =
+    b"(uuua(ayay))\0" as *const u8 as *const c_char;
 pub const OSTREE_MAX_METADATA_SIZE: c_int = 10485760;
 pub const OSTREE_MAX_METADATA_WARN_SIZE: c_int = 7340032;
-pub const OSTREE_METADATA_KEY_BOOTABLE: *const c_char = b"ostree.bootable\0" as *const u8 as *const c_char;
-pub const OSTREE_METADATA_KEY_LINUX: *const c_char = b"ostree.linux\0" as *const u8 as *const c_char;
-pub const OSTREE_META_KEY_DEPLOY_COLLECTION_ID: *const c_char = b"ostree.deploy-collection-id\0" as *const u8 as *const c_char;
-pub const OSTREE_ORIGIN_TRANSIENT_GROUP: *const c_char = b"libostree-transient\0" as *const u8 as *const c_char;
-pub const OSTREE_REPO_METADATA_REF: *const c_char = b"ostree-metadata\0" as *const u8 as *const c_char;
+pub const OSTREE_METADATA_KEY_BOOTABLE: *const c_char =
+    b"ostree.bootable\0" as *const u8 as *const c_char;
+pub const OSTREE_METADATA_KEY_LINUX: *const c_char =
+    b"ostree.linux\0" as *const u8 as *const c_char;
+pub const OSTREE_META_KEY_DEPLOY_COLLECTION_ID: *const c_char =
+    b"ostree.deploy-collection-id\0" as *const u8 as *const c_char;
+pub const OSTREE_ORIGIN_TRANSIENT_GROUP: *const c_char =
+    b"libostree-transient\0" as *const u8 as *const c_char;
+pub const OSTREE_REPO_METADATA_REF: *const c_char =
+    b"ostree-metadata\0" as *const u8 as *const c_char;
 pub const OSTREE_SHA256_DIGEST_LEN: c_int = 32;
 pub const OSTREE_SHA256_STRING_LEN: c_int = 64;
 pub const OSTREE_SIGN_NAME_ED25519: *const c_char = b"ed25519\0" as *const u8 as *const c_char;
-pub const OSTREE_SUMMARY_GVARIANT_STRING: *const c_char = b"(a(s(taya{sv}))a{sv})\0" as *const u8 as *const c_char;
-pub const OSTREE_SUMMARY_SIG_GVARIANT_STRING: *const c_char = b"a{sv}\0" as *const u8 as *const c_char;
+pub const OSTREE_SUMMARY_GVARIANT_STRING: *const c_char =
+    b"(a(s(taya{sv}))a{sv})\0" as *const u8 as *const c_char;
+pub const OSTREE_SUMMARY_SIG_GVARIANT_STRING: *const c_char =
+    b"a{sv}\0" as *const u8 as *const c_char;
 pub const OSTREE_TIMESTAMP: c_int = 0;
-pub const OSTREE_TREE_GVARIANT_STRING: *const c_char = b"(a(say)a(sayay))\0" as *const u8 as *const c_char;
+pub const OSTREE_TREE_GVARIANT_STRING: *const c_char =
+    b"(a(say)a(sayay))\0" as *const u8 as *const c_char;
 
 // Flags
 pub type OstreeChecksumFlags = c_uint;
@@ -154,7 +178,8 @@ pub type OstreeRepoCommitModifierFlags = c_uint;
 pub const OSTREE_REPO_COMMIT_MODIFIER_FLAGS_NONE: OstreeRepoCommitModifierFlags = 0;
 pub const OSTREE_REPO_COMMIT_MODIFIER_FLAGS_SKIP_XATTRS: OstreeRepoCommitModifierFlags = 1;
 pub const OSTREE_REPO_COMMIT_MODIFIER_FLAGS_GENERATE_SIZES: OstreeRepoCommitModifierFlags = 2;
-pub const OSTREE_REPO_COMMIT_MODIFIER_FLAGS_CANONICAL_PERMISSIONS: OstreeRepoCommitModifierFlags = 4;
+pub const OSTREE_REPO_COMMIT_MODIFIER_FLAGS_CANONICAL_PERMISSIONS: OstreeRepoCommitModifierFlags =
+    4;
 pub const OSTREE_REPO_COMMIT_MODIFIER_FLAGS_ERROR_ON_UNLABELED: OstreeRepoCommitModifierFlags = 8;
 pub const OSTREE_REPO_COMMIT_MODIFIER_FLAGS_CONSUME: OstreeRepoCommitModifierFlags = 16;
 pub const OSTREE_REPO_COMMIT_MODIFIER_FLAGS_DEVINO_CANONICAL: OstreeRepoCommitModifierFlags = 32;
@@ -202,12 +227,18 @@ pub const OSTREE_SEPOLICY_RESTORECON_FLAGS_ALLOW_NOLABEL: OstreeSePolicyRestorec
 pub const OSTREE_SEPOLICY_RESTORECON_FLAGS_KEEP_EXISTING: OstreeSePolicyRestoreconFlags = 2;
 
 pub type OstreeSysrootSimpleWriteDeploymentFlags = c_uint;
-pub const OSTREE_SYSROOT_SIMPLE_WRITE_DEPLOYMENT_FLAGS_NONE: OstreeSysrootSimpleWriteDeploymentFlags = 0;
-pub const OSTREE_SYSROOT_SIMPLE_WRITE_DEPLOYMENT_FLAGS_RETAIN: OstreeSysrootSimpleWriteDeploymentFlags = 1;
-pub const OSTREE_SYSROOT_SIMPLE_WRITE_DEPLOYMENT_FLAGS_NOT_DEFAULT: OstreeSysrootSimpleWriteDeploymentFlags = 2;
-pub const OSTREE_SYSROOT_SIMPLE_WRITE_DEPLOYMENT_FLAGS_NO_CLEAN: OstreeSysrootSimpleWriteDeploymentFlags = 4;
-pub const OSTREE_SYSROOT_SIMPLE_WRITE_DEPLOYMENT_FLAGS_RETAIN_PENDING: OstreeSysrootSimpleWriteDeploymentFlags = 8;
-pub const OSTREE_SYSROOT_SIMPLE_WRITE_DEPLOYMENT_FLAGS_RETAIN_ROLLBACK: OstreeSysrootSimpleWriteDeploymentFlags = 16;
+pub const OSTREE_SYSROOT_SIMPLE_WRITE_DEPLOYMENT_FLAGS_NONE:
+    OstreeSysrootSimpleWriteDeploymentFlags = 0;
+pub const OSTREE_SYSROOT_SIMPLE_WRITE_DEPLOYMENT_FLAGS_RETAIN:
+    OstreeSysrootSimpleWriteDeploymentFlags = 1;
+pub const OSTREE_SYSROOT_SIMPLE_WRITE_DEPLOYMENT_FLAGS_NOT_DEFAULT:
+    OstreeSysrootSimpleWriteDeploymentFlags = 2;
+pub const OSTREE_SYSROOT_SIMPLE_WRITE_DEPLOYMENT_FLAGS_NO_CLEAN:
+    OstreeSysrootSimpleWriteDeploymentFlags = 4;
+pub const OSTREE_SYSROOT_SIMPLE_WRITE_DEPLOYMENT_FLAGS_RETAIN_PENDING:
+    OstreeSysrootSimpleWriteDeploymentFlags = 8;
+pub const OSTREE_SYSROOT_SIMPLE_WRITE_DEPLOYMENT_FLAGS_RETAIN_ROLLBACK:
+    OstreeSysrootSimpleWriteDeploymentFlags = 16;
 
 pub type OstreeSysrootUpgraderFlags = c_uint;
 pub const OSTREE_SYSROOT_UPGRADER_FLAGS_IGNORE_UNCONFIGURED: OstreeSysrootUpgraderFlags = 2;
@@ -218,10 +249,33 @@ pub const OSTREE_SYSROOT_UPGRADER_PULL_FLAGS_ALLOW_OLDER: OstreeSysrootUpgraderP
 pub const OSTREE_SYSROOT_UPGRADER_PULL_FLAGS_SYNTHETIC: OstreeSysrootUpgraderPullFlags = 2;
 
 // Callbacks
-pub type OstreeRepoCheckoutFilter = Option<unsafe extern "C" fn(*mut OstreeRepo, *const c_char, *mut stat, gpointer) -> OstreeRepoCheckoutFilterResult>;
-pub type OstreeRepoCommitFilter = Option<unsafe extern "C" fn(*mut OstreeRepo, *const c_char, *mut gio::GFileInfo, gpointer) -> OstreeRepoCommitFilterResult>;
-pub type OstreeRepoCommitModifierXattrCallback = Option<unsafe extern "C" fn(*mut OstreeRepo, *const c_char, *mut gio::GFileInfo, gpointer) -> *mut glib::GVariant>;
-pub type OstreeRepoImportArchiveTranslatePathname = Option<unsafe extern "C" fn(*mut OstreeRepo, *const stat, *const c_char, gpointer) -> *mut c_char>;
+pub type OstreeRepoCheckoutFilter = Option<
+    unsafe extern "C" fn(
+        *mut OstreeRepo,
+        *const c_char,
+        *mut stat,
+        gpointer,
+    ) -> OstreeRepoCheckoutFilterResult,
+>;
+pub type OstreeRepoCommitFilter = Option<
+    unsafe extern "C" fn(
+        *mut OstreeRepo,
+        *const c_char,
+        *mut gio::GFileInfo,
+        gpointer,
+    ) -> OstreeRepoCommitFilterResult,
+>;
+pub type OstreeRepoCommitModifierXattrCallback = Option<
+    unsafe extern "C" fn(
+        *mut OstreeRepo,
+        *const c_char,
+        *mut gio::GFileInfo,
+        gpointer,
+    ) -> *mut glib::GVariant,
+>;
+pub type OstreeRepoImportArchiveTranslatePathname = Option<
+    unsafe extern "C" fn(*mut OstreeRepo, *const stat, *const c_char, gpointer) -> *mut c_char,
+>;
 
 // Records
 #[repr(C)]
@@ -233,10 +287,10 @@ pub struct OstreeAsyncProgressClass {
 
 impl ::std::fmt::Debug for OstreeAsyncProgressClass {
     fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result {
-        f.debug_struct(&format!("OstreeAsyncProgressClass @ {:?}", self as *const _))
-         .field("parent_class", &self.parent_class)
-         .field("changed", &self.changed)
-         .finish()
+        f.debug_struct(&format!("OstreeAsyncProgressClass @ {:p}", self))
+            .field("parent_class", &self.parent_class)
+            .field("changed", &self.changed)
+            .finish()
     }
 }
 
@@ -279,10 +333,10 @@ pub struct OstreeCollectionRef {
 
 impl ::std::fmt::Debug for OstreeCollectionRef {
     fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result {
-        f.debug_struct(&format!("OstreeCollectionRef @ {:?}", self as *const _))
-         .field("collection_id", &self.collection_id)
-         .field("ref_name", &self.ref_name)
-         .finish()
+        f.debug_struct(&format!("OstreeCollectionRef @ {:p}", self))
+            .field("collection_id", &self.collection_id)
+            .field("ref_name", &self.ref_name)
+            .finish()
     }
 }
 
@@ -297,12 +351,12 @@ pub struct OstreeCommitSizesEntry {
 
 impl ::std::fmt::Debug for OstreeCommitSizesEntry {
     fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result {
-        f.debug_struct(&format!("OstreeCommitSizesEntry @ {:?}", self as *const _))
-         .field("checksum", &self.checksum)
-         .field("objtype", &self.objtype)
-         .field("unpacked", &self.unpacked)
-         .field("archived", &self.archived)
-         .finish()
+        f.debug_struct(&format!("OstreeCommitSizesEntry @ {:p}", self))
+            .field("checksum", &self.checksum)
+            .field("objtype", &self.objtype)
+            .field("unpacked", &self.unpacked)
+            .field("archived", &self.archived)
+            .finish()
     }
 }
 
@@ -314,9 +368,9 @@ pub struct OstreeContentWriterClass {
 
 impl ::std::fmt::Debug for OstreeContentWriterClass {
     fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result {
-        f.debug_struct(&format!("OstreeContentWriterClass @ {:?}", self as *const _))
-         .field("parent_class", &self.parent_class)
-         .finish()
+        f.debug_struct(&format!("OstreeContentWriterClass @ {:p}", self))
+            .field("parent_class", &self.parent_class)
+            .finish()
     }
 }
 
@@ -333,14 +387,14 @@ pub struct OstreeDiffDirsOptions {
 
 impl ::std::fmt::Debug for OstreeDiffDirsOptions {
     fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result {
-        f.debug_struct(&format!("OstreeDiffDirsOptions @ {:?}", self as *const _))
-         .field("owner_uid", &self.owner_uid)
-         .field("owner_gid", &self.owner_gid)
-         .field("devino_to_csum_cache", &self.devino_to_csum_cache)
-         .field("unused_bools", &self.unused_bools)
-         .field("unused_ints", &self.unused_ints)
-         .field("unused_ptrs", &self.unused_ptrs)
-         .finish()
+        f.debug_struct(&format!("OstreeDiffDirsOptions @ {:p}", self))
+            .field("owner_uid", &self.owner_uid)
+            .field("owner_gid", &self.owner_gid)
+            .field("devino_to_csum_cache", &self.devino_to_csum_cache)
+            .field("unused_bools", &self.unused_bools)
+            .field("unused_ints", &self.unused_ints)
+            .field("unused_ptrs", &self.unused_ptrs)
+            .finish()
     }
 }
 
@@ -358,15 +412,15 @@ pub struct OstreeDiffItem {
 
 impl ::std::fmt::Debug for OstreeDiffItem {
     fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result {
-        f.debug_struct(&format!("OstreeDiffItem @ {:?}", self as *const _))
-         .field("refcount", &self.refcount)
-         .field("src", &self.src)
-         .field("target", &self.target)
-         .field("src_info", &self.src_info)
-         .field("target_info", &self.target_info)
-         .field("src_checksum", &self.src_checksum)
-         .field("target_checksum", &self.target_checksum)
-         .finish()
+        f.debug_struct(&format!("OstreeDiffItem @ {:p}", self))
+            .field("refcount", &self.refcount)
+            .field("src", &self.src)
+            .field("target", &self.target)
+            .field("src_info", &self.src_info)
+            .field("target_info", &self.target_info)
+            .field("src_checksum", &self.src_checksum)
+            .field("target_checksum", &self.target_checksum)
+            .finish()
     }
 }
 
@@ -408,9 +462,9 @@ pub struct OstreeMutableTreeClass {
 
 impl ::std::fmt::Debug for OstreeMutableTreeClass {
     fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result {
-        f.debug_struct(&format!("OstreeMutableTreeClass @ {:?}", self as *const _))
-         .field("parent_class", &self.parent_class)
-         .finish()
+        f.debug_struct(&format!("OstreeMutableTreeClass @ {:p}", self))
+            .field("parent_class", &self.parent_class)
+            .finish()
     }
 }
 
@@ -423,10 +477,10 @@ pub struct OstreeMutableTreeIter {
 
 impl ::std::fmt::Debug for OstreeMutableTreeIter {
     fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result {
-        f.debug_struct(&format!("OstreeMutableTreeIter @ {:?}", self as *const _))
-         .field("in_files", &self.in_files)
-         .field("iter", &self.iter)
-         .finish()
+        f.debug_struct(&format!("OstreeMutableTreeIter @ {:p}", self))
+            .field("in_files", &self.in_files)
+            .field("iter", &self.iter)
+            .finish()
     }
 }
 
@@ -435,8 +489,8 @@ pub struct OstreeRemote(c_void);
 
 impl ::std::fmt::Debug for OstreeRemote {
     fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result {
-        f.debug_struct(&format!("OstreeRemote @ {:?}", self as *const _))
-         .finish()
+        f.debug_struct(&format!("OstreeRemote @ {:p}", self))
+            .finish()
     }
 }
 
@@ -465,26 +519,26 @@ pub struct OstreeRepoCheckoutAtOptions {
 
 impl ::std::fmt::Debug for OstreeRepoCheckoutAtOptions {
     fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result {
-        f.debug_struct(&format!("OstreeRepoCheckoutAtOptions @ {:?}", self as *const _))
-         .field("mode", &self.mode)
-         .field("overwrite_mode", &self.overwrite_mode)
-         .field("enable_uncompressed_cache", &self.enable_uncompressed_cache)
-         .field("enable_fsync", &self.enable_fsync)
-         .field("process_whiteouts", &self.process_whiteouts)
-         .field("no_copy_fallback", &self.no_copy_fallback)
-         .field("force_copy", &self.force_copy)
-         .field("bareuseronly_dirs", &self.bareuseronly_dirs)
-         .field("force_copy_zerosized", &self.force_copy_zerosized)
-         .field("unused_bools", &self.unused_bools)
-         .field("subpath", &self.subpath)
-         .field("devino_to_csum_cache", &self.devino_to_csum_cache)
-         .field("unused_ints", &self.unused_ints)
-         .field("unused_ptrs", &self.unused_ptrs)
-         .field("filter", &self.filter)
-         .field("filter_user_data", &self.filter_user_data)
-         .field("sepolicy", &self.sepolicy)
-         .field("sepolicy_prefix", &self.sepolicy_prefix)
-         .finish()
+        f.debug_struct(&format!("OstreeRepoCheckoutAtOptions @ {:p}", self))
+            .field("mode", &self.mode)
+            .field("overwrite_mode", &self.overwrite_mode)
+            .field("enable_uncompressed_cache", &self.enable_uncompressed_cache)
+            .field("enable_fsync", &self.enable_fsync)
+            .field("process_whiteouts", &self.process_whiteouts)
+            .field("no_copy_fallback", &self.no_copy_fallback)
+            .field("force_copy", &self.force_copy)
+            .field("bareuseronly_dirs", &self.bareuseronly_dirs)
+            .field("force_copy_zerosized", &self.force_copy_zerosized)
+            .field("unused_bools", &self.unused_bools)
+            .field("subpath", &self.subpath)
+            .field("devino_to_csum_cache", &self.devino_to_csum_cache)
+            .field("unused_ints", &self.unused_ints)
+            .field("unused_ptrs", &self.unused_ptrs)
+            .field("filter", &self.filter)
+            .field("filter_user_data", &self.filter_user_data)
+            .field("sepolicy", &self.sepolicy)
+            .field("sepolicy_prefix", &self.sepolicy_prefix)
+            .finish()
     }
 }
 
@@ -499,11 +553,11 @@ pub struct OstreeRepoCheckoutOptions {
 
 impl ::std::fmt::Debug for OstreeRepoCheckoutOptions {
     fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result {
-        f.debug_struct(&format!("OstreeRepoCheckoutOptions @ {:?}", self as *const _))
-         .field("mode", &self.mode)
-         .field("overwrite_mode", &self.overwrite_mode)
-         .field("enable_uncompressed_cache", &self.enable_uncompressed_cache)
-         .finish()
+        f.debug_struct(&format!("OstreeRepoCheckoutOptions @ {:p}", self))
+            .field("mode", &self.mode)
+            .field("overwrite_mode", &self.overwrite_mode)
+            .field("enable_uncompressed_cache", &self.enable_uncompressed_cache)
+            .finish()
     }
 }
 
@@ -512,8 +566,8 @@ pub struct OstreeRepoCommitModifier(c_void);
 
 impl ::std::fmt::Debug for OstreeRepoCommitModifier {
     fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result {
-        f.debug_struct(&format!("OstreeRepoCommitModifier @ {:?}", self as *const _))
-         .finish()
+        f.debug_struct(&format!("OstreeRepoCommitModifier @ {:p}", self))
+            .finish()
     }
 }
 
@@ -527,10 +581,10 @@ pub struct OstreeRepoCommitTraverseIter {
 
 impl ::std::fmt::Debug for OstreeRepoCommitTraverseIter {
     fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result {
-        f.debug_struct(&format!("OstreeRepoCommitTraverseIter @ {:?}", self as *const _))
-         .field("initialized", &self.initialized)
-         .field("dummy", &self.dummy)
-         .finish()
+        f.debug_struct(&format!("OstreeRepoCommitTraverseIter @ {:p}", self))
+            .field("initialized", &self.initialized)
+            .field("dummy", &self.dummy)
+            .finish()
     }
 }
 
@@ -539,8 +593,8 @@ pub struct OstreeRepoDevInoCache(c_void);
 
 impl ::std::fmt::Debug for OstreeRepoDevInoCache {
     fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result {
-        f.debug_struct(&format!("OstreeRepoDevInoCache @ {:?}", self as *const _))
-         .finish()
+        f.debug_struct(&format!("OstreeRepoDevInoCache @ {:p}", self))
+            .finish()
     }
 }
 
@@ -553,9 +607,9 @@ pub struct OstreeRepoExportArchiveOptions {
 
 impl ::std::fmt::Debug for OstreeRepoExportArchiveOptions {
     fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result {
-        f.debug_struct(&format!("OstreeRepoExportArchiveOptions @ {:?}", self as *const _))
-         .field("disable_xattrs", &self.disable_xattrs)
-         .finish()
+        f.debug_struct(&format!("OstreeRepoExportArchiveOptions @ {:p}", self))
+            .field("disable_xattrs", &self.disable_xattrs)
+            .finish()
     }
 }
 
@@ -567,9 +621,9 @@ pub struct OstreeRepoFileClass {
 
 impl ::std::fmt::Debug for OstreeRepoFileClass {
     fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result {
-        f.debug_struct(&format!("OstreeRepoFileClass @ {:?}", self as *const _))
-         .field("parent_class", &self.parent_class)
-         .finish()
+        f.debug_struct(&format!("OstreeRepoFileClass @ {:p}", self))
+            .field("parent_class", &self.parent_class)
+            .finish()
     }
 }
 
@@ -586,9 +640,9 @@ pub struct OstreeRepoFinderAvahiClass {
 
 impl ::std::fmt::Debug for OstreeRepoFinderAvahiClass {
     fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result {
-        f.debug_struct(&format!("OstreeRepoFinderAvahiClass @ {:?}", self as *const _))
-         .field("parent_class", &self.parent_class)
-         .finish()
+        f.debug_struct(&format!("OstreeRepoFinderAvahiClass @ {:p}", self))
+            .field("parent_class", &self.parent_class)
+            .finish()
     }
 }
 
@@ -600,9 +654,9 @@ pub struct OstreeRepoFinderConfigClass {
 
 impl ::std::fmt::Debug for OstreeRepoFinderConfigClass {
     fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result {
-        f.debug_struct(&format!("OstreeRepoFinderConfigClass @ {:?}", self as *const _))
-         .field("parent_class", &self.parent_class)
-         .finish()
+        f.debug_struct(&format!("OstreeRepoFinderConfigClass @ {:p}", self))
+            .field("parent_class", &self.parent_class)
+            .finish()
     }
 }
 
@@ -610,17 +664,32 @@ impl ::std::fmt::Debug for OstreeRepoFinderConfigClass {
 #[derive(Copy, Clone)]
 pub struct OstreeRepoFinderInterface {
     pub g_iface: gobject::GTypeInterface,
-    pub resolve_async: Option<unsafe extern "C" fn(*mut OstreeRepoFinder, *const *const OstreeCollectionRef, *mut OstreeRepo, *mut gio::GCancellable, gio::GAsyncReadyCallback, gpointer)>,
-    pub resolve_finish: Option<unsafe extern "C" fn(*mut OstreeRepoFinder, *mut gio::GAsyncResult, *mut *mut glib::GError) -> *mut glib::GPtrArray>,
+    pub resolve_async: Option<
+        unsafe extern "C" fn(
+            *mut OstreeRepoFinder,
+            *const *const OstreeCollectionRef,
+            *mut OstreeRepo,
+            *mut gio::GCancellable,
+            gio::GAsyncReadyCallback,
+            gpointer,
+        ),
+    >,
+    pub resolve_finish: Option<
+        unsafe extern "C" fn(
+            *mut OstreeRepoFinder,
+            *mut gio::GAsyncResult,
+            *mut *mut glib::GError,
+        ) -> *mut glib::GPtrArray,
+    >,
 }
 
 impl ::std::fmt::Debug for OstreeRepoFinderInterface {
     fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result {
-        f.debug_struct(&format!("OstreeRepoFinderInterface @ {:?}", self as *const _))
-         .field("g_iface", &self.g_iface)
-         .field("resolve_async", &self.resolve_async)
-         .field("resolve_finish", &self.resolve_finish)
-         .finish()
+        f.debug_struct(&format!("OstreeRepoFinderInterface @ {:p}", self))
+            .field("g_iface", &self.g_iface)
+            .field("resolve_async", &self.resolve_async)
+            .field("resolve_finish", &self.resolve_finish)
+            .finish()
     }
 }
 
@@ -632,9 +701,9 @@ pub struct OstreeRepoFinderMountClass {
 
 impl ::std::fmt::Debug for OstreeRepoFinderMountClass {
     fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result {
-        f.debug_struct(&format!("OstreeRepoFinderMountClass @ {:?}", self as *const _))
-         .field("parent_class", &self.parent_class)
-         .finish()
+        f.debug_struct(&format!("OstreeRepoFinderMountClass @ {:p}", self))
+            .field("parent_class", &self.parent_class)
+            .finish()
     }
 }
 
@@ -646,9 +715,9 @@ pub struct OstreeRepoFinderOverrideClass {
 
 impl ::std::fmt::Debug for OstreeRepoFinderOverrideClass {
     fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result {
-        f.debug_struct(&format!("OstreeRepoFinderOverrideClass @ {:?}", self as *const _))
-         .field("parent_class", &self.parent_class)
-         .finish()
+        f.debug_struct(&format!("OstreeRepoFinderOverrideClass @ {:p}", self))
+            .field("parent_class", &self.parent_class)
+            .finish()
     }
 }
 
@@ -666,14 +735,14 @@ pub struct OstreeRepoFinderResult {
 
 impl ::std::fmt::Debug for OstreeRepoFinderResult {
     fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result {
-        f.debug_struct(&format!("OstreeRepoFinderResult @ {:?}", self as *const _))
-         .field("remote", &self.remote)
-         .field("finder", &self.finder)
-         .field("priority", &self.priority)
-         .field("ref_to_checksum", &self.ref_to_checksum)
-         .field("summary_last_modified", &self.summary_last_modified)
-         .field("ref_to_timestamp", &self.ref_to_timestamp)
-         .finish()
+        f.debug_struct(&format!("OstreeRepoFinderResult @ {:p}", self))
+            .field("remote", &self.remote)
+            .field("finder", &self.finder)
+            .field("priority", &self.priority)
+            .field("ref_to_checksum", &self.ref_to_checksum)
+            .field("summary_last_modified", &self.summary_last_modified)
+            .field("ref_to_timestamp", &self.ref_to_timestamp)
+            .finish()
     }
 }
 
@@ -686,9 +755,12 @@ pub struct OstreeRepoImportArchiveOptions {
 
 impl ::std::fmt::Debug for OstreeRepoImportArchiveOptions {
     fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result {
-        f.debug_struct(&format!("OstreeRepoImportArchiveOptions @ {:?}", self as *const _))
-         .field("ignore_unsupported_content", &self.ignore_unsupported_content)
-         .finish()
+        f.debug_struct(&format!("OstreeRepoImportArchiveOptions @ {:p}", self))
+            .field(
+                "ignore_unsupported_content",
+                &self.ignore_unsupported_content,
+            )
+            .finish()
     }
 }
 
@@ -704,13 +776,13 @@ pub struct OstreeRepoPruneOptions {
 
 impl ::std::fmt::Debug for OstreeRepoPruneOptions {
     fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result {
-        f.debug_struct(&format!("OstreeRepoPruneOptions @ {:?}", self as *const _))
-         .field("flags", &self.flags)
-         .field("reachable", &self.reachable)
-         .field("unused_bools", &self.unused_bools)
-         .field("unused_ints", &self.unused_ints)
-         .field("unused_ptrs", &self.unused_ptrs)
-         .finish()
+        f.debug_struct(&format!("OstreeRepoPruneOptions @ {:p}", self))
+            .field("flags", &self.flags)
+            .field("reachable", &self.reachable)
+            .field("unused_bools", &self.unused_bools)
+            .field("unused_ints", &self.unused_ints)
+            .field("unused_ptrs", &self.unused_ptrs)
+            .finish()
     }
 }
 
@@ -731,18 +803,18 @@ pub struct OstreeRepoTransactionStats {
 
 impl ::std::fmt::Debug for OstreeRepoTransactionStats {
     fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result {
-        f.debug_struct(&format!("OstreeRepoTransactionStats @ {:?}", self as *const _))
-         .field("metadata_objects_total", &self.metadata_objects_total)
-         .field("metadata_objects_written", &self.metadata_objects_written)
-         .field("content_objects_total", &self.content_objects_total)
-         .field("content_objects_written", &self.content_objects_written)
-         .field("content_bytes_written", &self.content_bytes_written)
-         .field("devino_cache_hits", &self.devino_cache_hits)
-         .field("padding1", &self.padding1)
-         .field("padding2", &self.padding2)
-         .field("padding3", &self.padding3)
-         .field("padding4", &self.padding4)
-         .finish()
+        f.debug_struct(&format!("OstreeRepoTransactionStats @ {:p}", self))
+            .field("metadata_objects_total", &self.metadata_objects_total)
+            .field("metadata_objects_written", &self.metadata_objects_written)
+            .field("content_objects_total", &self.content_objects_total)
+            .field("content_objects_written", &self.content_objects_written)
+            .field("content_bytes_written", &self.content_bytes_written)
+            .field("devino_cache_hits", &self.devino_cache_hits)
+            .field("padding1", &self.padding1)
+            .field("padding2", &self.padding2)
+            .field("padding3", &self.padding3)
+            .field("padding4", &self.padding4)
+            .finish()
     }
 }
 
@@ -751,32 +823,73 @@ impl ::std::fmt::Debug for OstreeRepoTransactionStats {
 pub struct OstreeSignInterface {
     pub g_iface: gobject::GTypeInterface,
     pub get_name: Option<unsafe extern "C" fn(*mut OstreeSign) -> *const c_char>,
-    pub data: Option<unsafe extern "C" fn(*mut OstreeSign, *mut glib::GBytes, *mut *mut glib::GBytes, *mut gio::GCancellable, *mut *mut glib::GError) -> gboolean>,
-    pub data_verify: Option<unsafe extern "C" fn(*mut OstreeSign, *mut glib::GBytes, *mut glib::GVariant, *mut *mut c_char, *mut *mut glib::GError) -> gboolean>,
+    pub data: Option<
+        unsafe extern "C" fn(
+            *mut OstreeSign,
+            *mut glib::GBytes,
+            *mut *mut glib::GBytes,
+            *mut gio::GCancellable,
+            *mut *mut glib::GError,
+        ) -> gboolean,
+    >,
+    pub data_verify: Option<
+        unsafe extern "C" fn(
+            *mut OstreeSign,
+            *mut glib::GBytes,
+            *mut glib::GVariant,
+            *mut *mut c_char,
+            *mut *mut glib::GError,
+        ) -> gboolean,
+    >,
     pub metadata_key: Option<unsafe extern "C" fn(*mut OstreeSign) -> *const c_char>,
     pub metadata_format: Option<unsafe extern "C" fn(*mut OstreeSign) -> *const c_char>,
-    pub clear_keys: Option<unsafe extern "C" fn(*mut OstreeSign, *mut *mut glib::GError) -> gboolean>,
-    pub set_sk: Option<unsafe extern "C" fn(*mut OstreeSign, *mut glib::GVariant, *mut *mut glib::GError) -> gboolean>,
-    pub set_pk: Option<unsafe extern "C" fn(*mut OstreeSign, *mut glib::GVariant, *mut *mut glib::GError) -> gboolean>,
-    pub add_pk: Option<unsafe extern "C" fn(*mut OstreeSign, *mut glib::GVariant, *mut *mut glib::GError) -> gboolean>,
-    pub load_pk: Option<unsafe extern "C" fn(*mut OstreeSign, *mut glib::GVariant, *mut *mut glib::GError) -> gboolean>,
+    pub clear_keys:
+        Option<unsafe extern "C" fn(*mut OstreeSign, *mut *mut glib::GError) -> gboolean>,
+    pub set_sk: Option<
+        unsafe extern "C" fn(
+            *mut OstreeSign,
+            *mut glib::GVariant,
+            *mut *mut glib::GError,
+        ) -> gboolean,
+    >,
+    pub set_pk: Option<
+        unsafe extern "C" fn(
+            *mut OstreeSign,
+            *mut glib::GVariant,
+            *mut *mut glib::GError,
+        ) -> gboolean,
+    >,
+    pub add_pk: Option<
+        unsafe extern "C" fn(
+            *mut OstreeSign,
+            *mut glib::GVariant,
+            *mut *mut glib::GError,
+        ) -> gboolean,
+    >,
+    pub load_pk: Option<
+        unsafe extern "C" fn(
+            *mut OstreeSign,
+            *mut glib::GVariant,
+            *mut *mut glib::GError,
+        ) -> gboolean,
+    >,
 }
 
 impl ::std::fmt::Debug for OstreeSignInterface {
     fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result {
-        f.debug_struct(&format!("OstreeSignInterface @ {:?}", self as *const _))
-         .field("g_iface", &self.g_iface)
-         .field("get_name", &self.get_name)
-         .field("data", &self.data)
-         .field("data_verify", &self.data_verify)
-         .field("metadata_key", &self.metadata_key)
-         .field("metadata_format", &self.metadata_format)
-         .field("clear_keys", &self.clear_keys)
-         .field("set_sk", &self.set_sk)
-         .field("set_pk", &self.set_pk)
-         .field("add_pk", &self.add_pk)
-         .field("load_pk", &self.load_pk)
-         .finish()
+        f.debug_struct(&format!("OstreeSignInterface @ {:p}", self))
+            .field("g_iface", &self.g_iface)
+            .field("get_name", &self.get_name)
+            .field("data", &self.data)
+            .field("data_verify", &self.data_verify)
+            .field("metadata_key", &self.metadata_key)
+            .field("metadata_format", &self.metadata_format)
+            .field("clear_keys", &self.clear_keys)
+            .field("set_sk", &self.set_sk)
+            .field("set_pk", &self.set_pk)
+            .field("add_pk", &self.add_pk)
+            .field("load_pk", &self.load_pk)
+            .finish()
     }
 }
 
@@ -792,13 +905,13 @@ pub struct OstreeSysrootDeployTreeOpts {
 
 impl ::std::fmt::Debug for OstreeSysrootDeployTreeOpts {
     fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result {
-        f.debug_struct(&format!("OstreeSysrootDeployTreeOpts @ {:?}", self as *const _))
-         .field("unused_bools", &self.unused_bools)
-         .field("unused_ints", &self.unused_ints)
-         .field("override_kernel_argv", &self.override_kernel_argv)
-         .field("overlay_initrds", &self.overlay_initrds)
-         .field("unused_ptrs", &self.unused_ptrs)
-         .finish()
+        f.debug_struct(&format!("OstreeSysrootDeployTreeOpts @ {:p}", self))
+            .field("unused_bools", &self.unused_bools)
+            .field("unused_ints", &self.unused_ints)
+            .field("override_kernel_argv", &self.override_kernel_argv)
+            .field("overlay_initrds", &self.overlay_initrds)
+            .field("unused_ptrs", &self.unused_ptrs)
+            .finish()
     }
 }
 
@@ -813,12 +926,12 @@ pub struct OstreeSysrootWriteDeploymentsOpts {
 
 impl ::std::fmt::Debug for OstreeSysrootWriteDeploymentsOpts {
     fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result {
-        f.debug_struct(&format!("OstreeSysrootWriteDeploymentsOpts @ {:?}", self as *const _))
-         .field("do_postclean", &self.do_postclean)
-         .field("unused_bools", &self.unused_bools)
-         .field("unused_ints", &self.unused_ints)
-         .field("unused_ptrs", &self.unused_ptrs)
-         .finish()
+        f.debug_struct(&format!("OstreeSysrootWriteDeploymentsOpts @ {:p}", self))
+            .field("do_postclean", &self.do_postclean)
+            .field("unused_bools", &self.unused_bools)
+            .field("unused_ints", &self.unused_ints)
+            .field("unused_ptrs", &self.unused_ptrs)
+            .finish()
     }
 }
 
@@ -838,8 +951,8 @@ pub struct OstreeAsyncProgress(c_void);
 
 impl ::std::fmt::Debug for OstreeAsyncProgress {
     fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result {
-        f.debug_struct(&format!("OstreeAsyncProgress @ {:?}", self as *const _))
-         .finish()
+        f.debug_struct(&format!("OstreeAsyncProgress @ {:p}", self))
+            .finish()
     }
 }
 
@@ -848,8 +961,8 @@ pub struct OstreeBootconfigParser(c_void);
 
 impl ::std::fmt::Debug for OstreeBootconfigParser {
     fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result {
-        f.debug_struct(&format!("OstreeBootconfigParser @ {:?}", self as *const _))
-         .finish()
+        f.debug_struct(&format!("OstreeBootconfigParser @ {:p}", self))
+            .finish()
     }
 }
 
@@ -858,8 +971,8 @@ pub struct OstreeContentWriter(c_void);
 
 impl ::std::fmt::Debug for OstreeContentWriter {
     fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result {
-        f.debug_struct(&format!("OstreeContentWriter @ {:?}", self as *const _))
-         .finish()
+        f.debug_struct(&format!("OstreeContentWriter @ {:p}", self))
+            .finish()
     }
 }
 
@@ -868,8 +981,8 @@ pub struct OstreeDeployment(c_void);
 
 impl ::std::fmt::Debug for OstreeDeployment {
     fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result {
-        f.debug_struct(&format!("OstreeDeployment @ {:?}", self as *const _))
-         .finish()
+        f.debug_struct(&format!("OstreeDeployment @ {:p}", self))
+            .finish()
     }
 }
 
@@ -878,8 +991,8 @@ pub struct OstreeGpgVerifyResult(c_void);
 
 impl ::std::fmt::Debug for OstreeGpgVerifyResult {
     fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result {
-        f.debug_struct(&format!("OstreeGpgVerifyResult @ {:?}", self as *const _))
-         .finish()
+        f.debug_struct(&format!("OstreeGpgVerifyResult @ {:p}", self))
+            .finish()
     }
 }
 
@@ -888,8 +1001,8 @@ pub struct OstreeMutableTree(c_void);
 
 impl ::std::fmt::Debug for OstreeMutableTree {
     fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result {
-        f.debug_struct(&format!("OstreeMutableTree @ {:?}", self as *const _))
-         .finish()
+        f.debug_struct(&format!("OstreeMutableTree @ {:p}", self))
+            .finish()
     }
 }
 
@@ -898,8 +1011,7 @@ pub struct OstreeRepo(c_void);
 
 impl ::std::fmt::Debug for OstreeRepo {
     fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result {
-        f.debug_struct(&format!("OstreeRepo @ {:?}", self as *const _))
-         .finish()
+        f.debug_struct(&format!("OstreeRepo @ {:p}", self)).finish()
     }
 }
 
@@ -908,8 +1020,8 @@ pub struct OstreeRepoFile(c_void);
 
 impl ::std::fmt::Debug for OstreeRepoFile {
     fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result {
-        f.debug_struct(&format!("OstreeRepoFile @ {:?}", self as *const _))
-         .finish()
+        f.debug_struct(&format!("OstreeRepoFile @ {:p}", self))
+            .finish()
     }
 }
 
@@ -918,8 +1030,8 @@ pub struct OstreeRepoFinderAvahi(c_void);
 
 impl ::std::fmt::Debug for OstreeRepoFinderAvahi {
     fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result {
-        f.debug_struct(&format!("OstreeRepoFinderAvahi @ {:?}", self as *const _))
-         .finish()
+        f.debug_struct(&format!("OstreeRepoFinderAvahi @ {:p}", self))
+            .finish()
     }
 }
 
@@ -928,8 +1040,8 @@ pub struct OstreeRepoFinderConfig(c_void);
 
 impl ::std::fmt::Debug for OstreeRepoFinderConfig {
     fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result {
-        f.debug_struct(&format!("OstreeRepoFinderConfig @ {:?}", self as *const _))
-         .finish()
+        f.debug_struct(&format!("OstreeRepoFinderConfig @ {:p}", self))
+            .finish()
     }
 }
 
@@ -938,8 +1050,8 @@ pub struct OstreeRepoFinderMount(c_void);
 
 impl ::std::fmt::Debug for OstreeRepoFinderMount {
     fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result {
-        f.debug_struct(&format!("OstreeRepoFinderMount @ {:?}", self as *const _))
-         .finish()
+        f.debug_struct(&format!("OstreeRepoFinderMount @ {:p}", self))
+            .finish()
     }
 }
 
@@ -948,8 +1060,8 @@ pub struct OstreeRepoFinderOverride(c_void);
 
 impl ::std::fmt::Debug for OstreeRepoFinderOverride {
     fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result {
-        f.debug_struct(&format!("OstreeRepoFinderOverride @ {:?}", self as *const _))
-         .finish()
+        f.debug_struct(&format!("OstreeRepoFinderOverride @ {:p}", self))
+            .finish()
     }
 }
 
@@ -958,8 +1070,8 @@ pub struct OstreeSePolicy(c_void);
 
 impl ::std::fmt::Debug for OstreeSePolicy {
     fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result {
-        f.debug_struct(&format!("OstreeSePolicy @ {:?}", self as *const _))
-         .finish()
+        f.debug_struct(&format!("OstreeSePolicy @ {:p}", self))
+            .finish()
     }
 }
 
@@ -968,8 +1080,8 @@ pub struct OstreeSysroot(c_void);
 
 impl ::std::fmt::Debug for OstreeSysroot {
     fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result {
-        f.debug_struct(&format!("OstreeSysroot @ {:?}", self as *const _))
-         .finish()
+        f.debug_struct(&format!("OstreeSysroot @ {:p}", self))
+            .finish()
     }
 }
 
@@ -978,8 +1090,8 @@ pub struct OstreeSysrootUpgrader(c_void);
 
 impl ::std::fmt::Debug for OstreeSysrootUpgrader {
     fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result {
-        f.debug_struct(&format!("OstreeSysrootUpgrader @ {:?}", self as *const _))
-         .finish()
+        f.debug_struct(&format!("OstreeSysrootUpgrader @ {:p}", self))
+            .finish()
     }
 }
 
@@ -989,7 +1101,7 @@ pub struct OstreeRepoFinder(c_void);
 
 impl ::std::fmt::Debug for OstreeRepoFinder {
     fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result {
-        write!(f, "OstreeRepoFinder @ {:?}", self as *const _)
+        write!(f, "OstreeRepoFinder @ {:p}", self)
     }
 }
 
@@ -998,11 +1110,11 @@ pub struct OstreeSign(c_void);
 
 impl ::std::fmt::Debug for OstreeSign {
     fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result {
-        write!(f, "OstreeSign @ {:?}", self as *const _)
+        write!(f, "OstreeSign @ {:p}", self)
     }
 }
 
-
+#[link(name = "ostree-1")]
 extern "C" {
 
     //=========================================================================
@@ -1014,32 +1126,56 @@ extern "C" {
     // OstreeCollectionRef
     //=========================================================================
     #[cfg(any(feature = "v2018_6", feature = "dox"))]
+    #[cfg_attr(feature = "dox", doc(cfg(feature = "v2018_6")))]
     pub fn ostree_collection_ref_get_type() -> GType;
     #[cfg(any(feature = "v2018_6", feature = "dox"))]
-    pub fn ostree_collection_ref_new(collection_id: *const c_char, ref_name: *const c_char) -> *mut OstreeCollectionRef;
+    #[cfg_attr(feature = "dox", doc(cfg(feature = "v2018_6")))]
+    pub fn ostree_collection_ref_new(
+        collection_id: *const c_char,
+        ref_name: *const c_char,
+    ) -> *mut OstreeCollectionRef;
     #[cfg(any(feature = "v2018_6", feature = "dox"))]
+    #[cfg_attr(feature = "dox", doc(cfg(feature = "v2018_6")))]
     pub fn ostree_collection_ref_dup(ref_: *const OstreeCollectionRef) -> *mut OstreeCollectionRef;
     #[cfg(any(feature = "v2018_6", feature = "dox"))]
+    #[cfg_attr(feature = "dox", doc(cfg(feature = "v2018_6")))]
     pub fn ostree_collection_ref_free(ref_: *mut OstreeCollectionRef);
     #[cfg(any(feature = "v2018_6", feature = "dox"))]
-    pub fn ostree_collection_ref_dupv(refs: *const *const OstreeCollectionRef) -> *mut *mut OstreeCollectionRef;
+    #[cfg_attr(feature = "dox", doc(cfg(feature = "v2018_6")))]
+    pub fn ostree_collection_ref_dupv(
+        refs: *const *const OstreeCollectionRef,
+    ) -> *mut *mut OstreeCollectionRef;
     #[cfg(any(feature = "v2018_6", feature = "dox"))]
+    #[cfg_attr(feature = "dox", doc(cfg(feature = "v2018_6")))]
     pub fn ostree_collection_ref_equal(ref1: gconstpointer, ref2: gconstpointer) -> gboolean;
     #[cfg(any(feature = "v2018_6", feature = "dox"))]
+    #[cfg_attr(feature = "dox", doc(cfg(feature = "v2018_6")))]
     pub fn ostree_collection_ref_freev(refs: *mut *mut OstreeCollectionRef);
     #[cfg(any(feature = "v2018_6", feature = "dox"))]
+    #[cfg_attr(feature = "dox", doc(cfg(feature = "v2018_6")))]
     pub fn ostree_collection_ref_hash(ref_: gconstpointer) -> c_uint;
 
     //=========================================================================
     // OstreeCommitSizesEntry
     //=========================================================================
     #[cfg(any(feature = "v2020_1", feature = "dox"))]
+    #[cfg_attr(feature = "dox", doc(cfg(feature = "v2020_1")))]
     pub fn ostree_commit_sizes_entry_get_type() -> GType;
     #[cfg(any(feature = "v2020_1", feature = "dox"))]
-    pub fn ostree_commit_sizes_entry_new(checksum: *const c_char, objtype: OstreeObjectType, unpacked: u64, archived: u64) -> *mut OstreeCommitSizesEntry;
+    #[cfg_attr(feature = "dox", doc(cfg(feature = "v2020_1")))]
+    pub fn ostree_commit_sizes_entry_new(
+        checksum: *const c_char,
+        objtype: OstreeObjectType,
+        unpacked: u64,
+        archived: u64,
+    ) -> *mut OstreeCommitSizesEntry;
     #[cfg(any(feature = "v2020_1", feature = "dox"))]
-    pub fn ostree_commit_sizes_entry_copy(entry: *const OstreeCommitSizesEntry) -> *mut OstreeCommitSizesEntry;
+    #[cfg_attr(feature = "dox", doc(cfg(feature = "v2020_1")))]
+    pub fn ostree_commit_sizes_entry_copy(
+        entry: *const OstreeCommitSizesEntry,
+    ) -> *mut OstreeCommitSizesEntry;
     #[cfg(any(feature = "v2020_1", feature = "dox"))]
+    #[cfg_attr(feature = "dox", doc(cfg(feature = "v2020_1")))]
     pub fn ostree_commit_sizes_entry_free(entry: *mut OstreeCommitSizesEntry);
 
     //=========================================================================
@@ -1053,84 +1189,184 @@ extern "C" {
     // OstreeKernelArgs
     //=========================================================================
     #[cfg(any(feature = "v2019_3", feature = "dox"))]
+    #[cfg_attr(feature = "dox", doc(cfg(feature = "v2019_3")))]
     pub fn ostree_kernel_args_append(kargs: *mut OstreeKernelArgs, arg: *const c_char);
     #[cfg(any(feature = "v2019_3", feature = "dox"))]
+    #[cfg_attr(feature = "dox", doc(cfg(feature = "v2019_3")))]
     pub fn ostree_kernel_args_append_argv(kargs: *mut OstreeKernelArgs, argv: *mut *mut c_char);
     #[cfg(any(feature = "v2019_3", feature = "dox"))]
-    pub fn ostree_kernel_args_append_argv_filtered(kargs: *mut OstreeKernelArgs, argv: *mut *mut c_char, prefixes: *mut *mut c_char);
+    #[cfg_attr(feature = "dox", doc(cfg(feature = "v2019_3")))]
+    pub fn ostree_kernel_args_append_argv_filtered(
+        kargs: *mut OstreeKernelArgs,
+        argv: *mut *mut c_char,
+        prefixes: *mut *mut c_char,
+    );
     #[cfg(any(feature = "v2019_3", feature = "dox"))]
-    pub fn ostree_kernel_args_append_proc_cmdline(kargs: *mut OstreeKernelArgs, cancellable: *mut gio::GCancellable, error: *mut *mut glib::GError) -> gboolean;
-    pub fn ostree_kernel_args_delete(kargs: *mut OstreeKernelArgs, arg: *const c_char, error: *mut *mut glib::GError) -> gboolean;
+    #[cfg_attr(feature = "dox", doc(cfg(feature = "v2019_3")))]
+    pub fn ostree_kernel_args_append_proc_cmdline(
+        kargs: *mut OstreeKernelArgs,
+        cancellable: *mut gio::GCancellable,
+        error: *mut *mut glib::GError,
+    ) -> gboolean;
+    pub fn ostree_kernel_args_delete(
+        kargs: *mut OstreeKernelArgs,
+        arg: *const c_char,
+        error: *mut *mut glib::GError,
+    ) -> gboolean;
     #[cfg(any(feature = "v2019_3", feature = "dox"))]
-    pub fn ostree_kernel_args_delete_key_entry(kargs: *mut OstreeKernelArgs, key: *const c_char, error: *mut *mut glib::GError) -> gboolean;
+    #[cfg_attr(feature = "dox", doc(cfg(feature = "v2019_3")))]
+    pub fn ostree_kernel_args_delete_key_entry(
+        kargs: *mut OstreeKernelArgs,
+        key: *const c_char,
+        error: *mut *mut glib::GError,
+    ) -> gboolean;
     #[cfg(any(feature = "v2019_3", feature = "dox"))]
+    #[cfg_attr(feature = "dox", doc(cfg(feature = "v2019_3")))]
     pub fn ostree_kernel_args_free(kargs: *mut OstreeKernelArgs);
     #[cfg(any(feature = "v2019_3", feature = "dox"))]
-    pub fn ostree_kernel_args_get_last_value(kargs: *mut OstreeKernelArgs, key: *const c_char) -> *const c_char;
+    #[cfg_attr(feature = "dox", doc(cfg(feature = "v2019_3")))]
+    pub fn ostree_kernel_args_get_last_value(
+        kargs: *mut OstreeKernelArgs,
+        key: *const c_char,
+    ) -> *const c_char;
     #[cfg(any(feature = "v2019_3", feature = "dox"))]
-    pub fn ostree_kernel_args_new_replace(kargs: *mut OstreeKernelArgs, arg: *const c_char, error: *mut *mut glib::GError) -> gboolean;
+    #[cfg_attr(feature = "dox", doc(cfg(feature = "v2019_3")))]
+    pub fn ostree_kernel_args_new_replace(
+        kargs: *mut OstreeKernelArgs,
+        arg: *const c_char,
+        error: *mut *mut glib::GError,
+    ) -> gboolean;
     #[cfg(any(feature = "v2019_3", feature = "dox"))]
+    #[cfg_attr(feature = "dox", doc(cfg(feature = "v2019_3")))]
     pub fn ostree_kernel_args_parse_append(kargs: *mut OstreeKernelArgs, options: *const c_char);
     #[cfg(any(feature = "v2019_3", feature = "dox"))]
+    #[cfg_attr(feature = "dox", doc(cfg(feature = "v2019_3")))]
     pub fn ostree_kernel_args_replace(kargs: *mut OstreeKernelArgs, arg: *const c_char);
     #[cfg(any(feature = "v2019_3", feature = "dox"))]
+    #[cfg_attr(feature = "dox", doc(cfg(feature = "v2019_3")))]
     pub fn ostree_kernel_args_replace_argv(kargs: *mut OstreeKernelArgs, argv: *mut *mut c_char);
     #[cfg(any(feature = "v2019_3", feature = "dox"))]
+    #[cfg_attr(feature = "dox", doc(cfg(feature = "v2019_3")))]
     pub fn ostree_kernel_args_replace_take(kargs: *mut OstreeKernelArgs, arg: *mut c_char);
     #[cfg(any(feature = "v2019_3", feature = "dox"))]
+    #[cfg_attr(feature = "dox", doc(cfg(feature = "v2019_3")))]
     pub fn ostree_kernel_args_to_string(kargs: *mut OstreeKernelArgs) -> *mut c_char;
     #[cfg(any(feature = "v2019_3", feature = "dox"))]
+    #[cfg_attr(feature = "dox", doc(cfg(feature = "v2019_3")))]
     pub fn ostree_kernel_args_to_strv(kargs: *mut OstreeKernelArgs) -> *mut *mut c_char;
     #[cfg(any(feature = "v2019_3", feature = "dox"))]
+    #[cfg_attr(feature = "dox", doc(cfg(feature = "v2019_3")))]
     pub fn ostree_kernel_args_cleanup(loc: *mut c_void);
     #[cfg(any(feature = "v2019_3", feature = "dox"))]
+    #[cfg_attr(feature = "dox", doc(cfg(feature = "v2019_3")))]
     pub fn ostree_kernel_args_from_string(options: *const c_char) -> *mut OstreeKernelArgs;
     #[cfg(any(feature = "v2019_3", feature = "dox"))]
+    #[cfg_attr(feature = "dox", doc(cfg(feature = "v2019_3")))]
     pub fn ostree_kernel_args_new() -> *mut OstreeKernelArgs;
 
     //=========================================================================
     // OstreeRemote
     //=========================================================================
     #[cfg(any(feature = "v2018_6", feature = "dox"))]
+    #[cfg_attr(feature = "dox", doc(cfg(feature = "v2018_6")))]
     pub fn ostree_remote_get_type() -> GType;
     #[cfg(any(feature = "v2018_6", feature = "dox"))]
+    #[cfg_attr(feature = "dox", doc(cfg(feature = "v2018_6")))]
     pub fn ostree_remote_get_name(remote: *mut OstreeRemote) -> *const c_char;
     #[cfg(any(feature = "v2018_6", feature = "dox"))]
+    #[cfg_attr(feature = "dox", doc(cfg(feature = "v2018_6")))]
     pub fn ostree_remote_get_url(remote: *mut OstreeRemote) -> *mut c_char;
     #[cfg(any(feature = "v2018_6", feature = "dox"))]
+    #[cfg_attr(feature = "dox", doc(cfg(feature = "v2018_6")))]
     pub fn ostree_remote_ref(remote: *mut OstreeRemote) -> *mut OstreeRemote;
     #[cfg(any(feature = "v2018_6", feature = "dox"))]
+    #[cfg_attr(feature = "dox", doc(cfg(feature = "v2018_6")))]
     pub fn ostree_remote_unref(remote: *mut OstreeRemote);
 
     //=========================================================================
     // OstreeRepoCheckoutAtOptions
     //=========================================================================
     #[cfg(any(feature = "v2017_13", feature = "dox"))]
-    pub fn ostree_repo_checkout_at_options_set_devino(opts: *mut OstreeRepoCheckoutAtOptions, cache: *mut OstreeRepoDevInoCache);
+    #[cfg_attr(feature = "dox", doc(cfg(feature = "v2017_13")))]
+    pub fn ostree_repo_checkout_at_options_set_devino(
+        opts: *mut OstreeRepoCheckoutAtOptions,
+        cache: *mut OstreeRepoDevInoCache,
+    );
 
     //=========================================================================
     // OstreeRepoCommitModifier
     //=========================================================================
     pub fn ostree_repo_commit_modifier_get_type() -> GType;
-    pub fn ostree_repo_commit_modifier_new(flags: OstreeRepoCommitModifierFlags, commit_filter: OstreeRepoCommitFilter, user_data: gpointer, destroy_notify: glib::GDestroyNotify) -> *mut OstreeRepoCommitModifier;
-    pub fn ostree_repo_commit_modifier_ref(modifier: *mut OstreeRepoCommitModifier) -> *mut OstreeRepoCommitModifier;
+    pub fn ostree_repo_commit_modifier_new(
+        flags: OstreeRepoCommitModifierFlags,
+        commit_filter: OstreeRepoCommitFilter,
+        user_data: gpointer,
+        destroy_notify: glib::GDestroyNotify,
+    ) -> *mut OstreeRepoCommitModifier;
+    pub fn ostree_repo_commit_modifier_ref(
+        modifier: *mut OstreeRepoCommitModifier,
+    ) -> *mut OstreeRepoCommitModifier;
     #[cfg(any(feature = "v2017_13", feature = "dox"))]
-    pub fn ostree_repo_commit_modifier_set_devino_cache(modifier: *mut OstreeRepoCommitModifier, cache: *mut OstreeRepoDevInoCache);
-    pub fn ostree_repo_commit_modifier_set_sepolicy(modifier: *mut OstreeRepoCommitModifier, sepolicy: *mut OstreeSePolicy);
+    #[cfg_attr(feature = "dox", doc(cfg(feature = "v2017_13")))]
+    pub fn ostree_repo_commit_modifier_set_devino_cache(
+        modifier: *mut OstreeRepoCommitModifier,
+        cache: *mut OstreeRepoDevInoCache,
+    );
+    pub fn ostree_repo_commit_modifier_set_sepolicy(
+        modifier: *mut OstreeRepoCommitModifier,
+        sepolicy: *mut OstreeSePolicy,
+    );
     #[cfg(any(feature = "v2020_4", feature = "dox"))]
-    pub fn ostree_repo_commit_modifier_set_sepolicy_from_commit(modifier: *mut OstreeRepoCommitModifier, repo: *mut OstreeRepo, rev: *const c_char, cancellable: *mut gio::GCancellable, error: *mut *mut glib::GError) -> gboolean;
-    pub fn ostree_repo_commit_modifier_set_xattr_callback(modifier: *mut OstreeRepoCommitModifier, callback: OstreeRepoCommitModifierXattrCallback, destroy: glib::GDestroyNotify, user_data: gpointer);
+    #[cfg_attr(feature = "dox", doc(cfg(feature = "v2020_4")))]
+    pub fn ostree_repo_commit_modifier_set_sepolicy_from_commit(
+        modifier: *mut OstreeRepoCommitModifier,
+        repo: *mut OstreeRepo,
+        rev: *const c_char,
+        cancellable: *mut gio::GCancellable,
+        error: *mut *mut glib::GError,
+    ) -> gboolean;
+    pub fn ostree_repo_commit_modifier_set_xattr_callback(
+        modifier: *mut OstreeRepoCommitModifier,
+        callback: OstreeRepoCommitModifierXattrCallback,
+        destroy: glib::GDestroyNotify,
+        user_data: gpointer,
+    );
     pub fn ostree_repo_commit_modifier_unref(modifier: *mut OstreeRepoCommitModifier);
 
     //=========================================================================
     // OstreeRepoCommitTraverseIter
     //=========================================================================
     pub fn ostree_repo_commit_traverse_iter_clear(iter: *mut OstreeRepoCommitTraverseIter);
-    pub fn ostree_repo_commit_traverse_iter_get_dir(iter: *mut OstreeRepoCommitTraverseIter, out_name: *mut *mut c_char, out_content_checksum: *mut *mut c_char, out_meta_checksum: *mut *mut c_char);
-    pub fn ostree_repo_commit_traverse_iter_get_file(iter: *mut OstreeRepoCommitTraverseIter, out_name: *mut *mut c_char, out_checksum: *mut *mut c_char);
-    pub fn ostree_repo_commit_traverse_iter_init_commit(iter: *mut OstreeRepoCommitTraverseIter, repo: *mut OstreeRepo, commit: *mut glib::GVariant, flags: OstreeRepoCommitTraverseFlags, error: *mut *mut glib::GError) -> gboolean;
-    pub fn ostree_repo_commit_traverse_iter_init_dirtree(iter: *mut OstreeRepoCommitTraverseIter, repo: *mut OstreeRepo, dirtree: *mut glib::GVariant, flags: OstreeRepoCommitTraverseFlags, error: *mut *mut glib::GError) -> gboolean;
-    pub fn ostree_repo_commit_traverse_iter_next(iter: *mut OstreeRepoCommitTraverseIter, cancellable: *mut gio::GCancellable, error: *mut *mut glib::GError) -> OstreeRepoCommitIterResult;
+    pub fn ostree_repo_commit_traverse_iter_get_dir(
+        iter: *mut OstreeRepoCommitTraverseIter,
+        out_name: *mut *mut c_char,
+        out_content_checksum: *mut *mut c_char,
+        out_meta_checksum: *mut *mut c_char,
+    );
+    pub fn ostree_repo_commit_traverse_iter_get_file(
+        iter: *mut OstreeRepoCommitTraverseIter,
+        out_name: *mut *mut c_char,
+        out_checksum: *mut *mut c_char,
+    );
+    pub fn ostree_repo_commit_traverse_iter_init_commit(
+        iter: *mut OstreeRepoCommitTraverseIter,
+        repo: *mut OstreeRepo,
+        commit: *mut glib::GVariant,
+        flags: OstreeRepoCommitTraverseFlags,
+        error: *mut *mut glib::GError,
+    ) -> gboolean;
+    pub fn ostree_repo_commit_traverse_iter_init_dirtree(
+        iter: *mut OstreeRepoCommitTraverseIter,
+        repo: *mut OstreeRepo,
+        dirtree: *mut glib::GVariant,
+        flags: OstreeRepoCommitTraverseFlags,
+        error: *mut *mut glib::GError,
+    ) -> gboolean;
+    pub fn ostree_repo_commit_traverse_iter_next(
+        iter: *mut OstreeRepoCommitTraverseIter,
+        cancellable: *mut gio::GCancellable,
+        error: *mut *mut glib::GError,
+    ) -> OstreeRepoCommitIterResult;
     pub fn ostree_repo_commit_traverse_iter_cleanup(p: *mut c_void);
 
     //=========================================================================
@@ -1138,23 +1374,43 @@ extern "C" {
     //=========================================================================
     pub fn ostree_repo_devino_cache_get_type() -> GType;
     pub fn ostree_repo_devino_cache_new() -> *mut OstreeRepoDevInoCache;
-    pub fn ostree_repo_devino_cache_ref(cache: *mut OstreeRepoDevInoCache) -> *mut OstreeRepoDevInoCache;
+    pub fn ostree_repo_devino_cache_ref(
+        cache: *mut OstreeRepoDevInoCache,
+    ) -> *mut OstreeRepoDevInoCache;
     pub fn ostree_repo_devino_cache_unref(cache: *mut OstreeRepoDevInoCache);
 
     //=========================================================================
     // OstreeRepoFinderResult
     //=========================================================================
     #[cfg(any(feature = "v2018_6", feature = "dox"))]
+    #[cfg_attr(feature = "dox", doc(cfg(feature = "v2018_6")))]
     pub fn ostree_repo_finder_result_get_type() -> GType;
     #[cfg(any(feature = "v2018_6", feature = "dox"))]
-    pub fn ostree_repo_finder_result_new(remote: *mut OstreeRemote, finder: *mut OstreeRepoFinder, priority: c_int, ref_to_checksum: *mut glib::GHashTable, ref_to_timestamp: *mut glib::GHashTable, summary_last_modified: u64) -> *mut OstreeRepoFinderResult;
+    #[cfg_attr(feature = "dox", doc(cfg(feature = "v2018_6")))]
+    pub fn ostree_repo_finder_result_new(
+        remote: *mut OstreeRemote,
+        finder: *mut OstreeRepoFinder,
+        priority: c_int,
+        ref_to_checksum: *mut glib::GHashTable,
+        ref_to_timestamp: *mut glib::GHashTable,
+        summary_last_modified: u64,
+    ) -> *mut OstreeRepoFinderResult;
     #[cfg(any(feature = "v2018_6", feature = "dox"))]
-    pub fn ostree_repo_finder_result_compare(a: *const OstreeRepoFinderResult, b: *const OstreeRepoFinderResult) -> c_int;
+    #[cfg_attr(feature = "dox", doc(cfg(feature = "v2018_6")))]
+    pub fn ostree_repo_finder_result_compare(
+        a: *const OstreeRepoFinderResult,
+        b: *const OstreeRepoFinderResult,
+    ) -> c_int;
     #[cfg(any(feature = "v2018_6", feature = "dox"))]
-    pub fn ostree_repo_finder_result_dup(result: *mut OstreeRepoFinderResult) -> *mut OstreeRepoFinderResult;
+    #[cfg_attr(feature = "dox", doc(cfg(feature = "v2018_6")))]
+    pub fn ostree_repo_finder_result_dup(
+        result: *mut OstreeRepoFinderResult,
+    ) -> *mut OstreeRepoFinderResult;
     #[cfg(any(feature = "v2018_6", feature = "dox"))]
+    #[cfg_attr(feature = "dox", doc(cfg(feature = "v2018_6")))]
     pub fn ostree_repo_finder_result_free(result: *mut OstreeRepoFinderResult);
     #[cfg(any(feature = "v2018_6", feature = "dox"))]
+    #[cfg_attr(feature = "dox", doc(cfg(feature = "v2018_6")))]
     pub fn ostree_repo_finder_result_freev(results: *mut *mut OstreeRepoFinderResult);
 
     //=========================================================================
@@ -1167,43 +1423,115 @@ extern "C" {
     //=========================================================================
     pub fn ostree_async_progress_get_type() -> GType;
     pub fn ostree_async_progress_new() -> *mut OstreeAsyncProgress;
-    pub fn ostree_async_progress_new_and_connect(changed: *mut gpointer, user_data: gpointer) -> *mut OstreeAsyncProgress;
+    pub fn ostree_async_progress_new_and_connect(
+        changed: *mut gpointer,
+        user_data: gpointer,
+    ) -> *mut OstreeAsyncProgress;
     #[cfg(any(feature = "v2019_6", feature = "dox"))]
-    pub fn ostree_async_progress_copy_state(self_: *mut OstreeAsyncProgress, dest: *mut OstreeAsyncProgress);
+    #[cfg_attr(feature = "dox", doc(cfg(feature = "v2019_6")))]
+    pub fn ostree_async_progress_copy_state(
+        self_: *mut OstreeAsyncProgress,
+        dest: *mut OstreeAsyncProgress,
+    );
     pub fn ostree_async_progress_finish(self_: *mut OstreeAsyncProgress);
     #[cfg(any(feature = "v2017_6", feature = "dox"))]
+    #[cfg_attr(feature = "dox", doc(cfg(feature = "v2017_6")))]
     pub fn ostree_async_progress_get(self_: *mut OstreeAsyncProgress, ...);
     #[cfg(any(feature = "v2017_6", feature = "dox"))]
+    #[cfg_attr(feature = "dox", doc(cfg(feature = "v2017_6")))]
     pub fn ostree_async_progress_get_status(self_: *mut OstreeAsyncProgress) -> *mut c_char;
-    pub fn ostree_async_progress_get_uint(self_: *mut OstreeAsyncProgress, key: *const c_char) -> c_uint;
-    pub fn ostree_async_progress_get_uint64(self_: *mut OstreeAsyncProgress, key: *const c_char) -> u64;
+    pub fn ostree_async_progress_get_uint(
+        self_: *mut OstreeAsyncProgress,
+        key: *const c_char,
+    ) -> c_uint;
+    pub fn ostree_async_progress_get_uint64(
+        self_: *mut OstreeAsyncProgress,
+        key: *const c_char,
+    ) -> u64;
     #[cfg(any(feature = "v2017_6", feature = "dox"))]
-    pub fn ostree_async_progress_get_variant(self_: *mut OstreeAsyncProgress, key: *const c_char) -> *mut glib::GVariant;
+    #[cfg_attr(feature = "dox", doc(cfg(feature = "v2017_6")))]
+    pub fn ostree_async_progress_get_variant(
+        self_: *mut OstreeAsyncProgress,
+        key: *const c_char,
+    ) -> *mut glib::GVariant;
     #[cfg(any(feature = "v2017_6", feature = "dox"))]
+    #[cfg_attr(feature = "dox", doc(cfg(feature = "v2017_6")))]
     pub fn ostree_async_progress_set(self_: *mut OstreeAsyncProgress, ...);
     #[cfg(any(feature = "v2017_6", feature = "dox"))]
+    #[cfg_attr(feature = "dox", doc(cfg(feature = "v2017_6")))]
     pub fn ostree_async_progress_set_status(self_: *mut OstreeAsyncProgress, status: *const c_char);
-    pub fn ostree_async_progress_set_uint(self_: *mut OstreeAsyncProgress, key: *const c_char, value: c_uint);
-    pub fn ostree_async_progress_set_uint64(self_: *mut OstreeAsyncProgress, key: *const c_char, value: u64);
+    pub fn ostree_async_progress_set_uint(
+        self_: *mut OstreeAsyncProgress,
+        key: *const c_char,
+        value: c_uint,
+    );
+    pub fn ostree_async_progress_set_uint64(
+        self_: *mut OstreeAsyncProgress,
+        key: *const c_char,
+        value: u64,
+    );
     #[cfg(any(feature = "v2017_6", feature = "dox"))]
-    pub fn ostree_async_progress_set_variant(self_: *mut OstreeAsyncProgress, key: *const c_char, value: *mut glib::GVariant);
+    #[cfg_attr(feature = "dox", doc(cfg(feature = "v2017_6")))]
+    pub fn ostree_async_progress_set_variant(
+        self_: *mut OstreeAsyncProgress,
+        key: *const c_char,
+        value: *mut glib::GVariant,
+    );
 
     //=========================================================================
     // OstreeBootconfigParser
     //=========================================================================
     pub fn ostree_bootconfig_parser_get_type() -> GType;
     pub fn ostree_bootconfig_parser_new() -> *mut OstreeBootconfigParser;
-    pub fn ostree_bootconfig_parser_clone(self_: *mut OstreeBootconfigParser) -> *mut OstreeBootconfigParser;
-    pub fn ostree_bootconfig_parser_get(self_: *mut OstreeBootconfigParser, key: *const c_char) -> *const c_char;
+    pub fn ostree_bootconfig_parser_clone(
+        self_: *mut OstreeBootconfigParser,
+    ) -> *mut OstreeBootconfigParser;
+    pub fn ostree_bootconfig_parser_get(
+        self_: *mut OstreeBootconfigParser,
+        key: *const c_char,
+    ) -> *const c_char;
     #[cfg(any(feature = "v2020_7", feature = "dox"))]
-    pub fn ostree_bootconfig_parser_get_overlay_initrds(self_: *mut OstreeBootconfigParser) -> *mut *mut c_char;
-    pub fn ostree_bootconfig_parser_parse(self_: *mut OstreeBootconfigParser, path: *mut gio::GFile, cancellable: *mut gio::GCancellable, error: *mut *mut glib::GError) -> gboolean;
-    pub fn ostree_bootconfig_parser_parse_at(self_: *mut OstreeBootconfigParser, dfd: c_int, path: *const c_char, cancellable: *mut gio::GCancellable, error: *mut *mut glib::GError) -> gboolean;
-    pub fn ostree_bootconfig_parser_set(self_: *mut OstreeBootconfigParser, key: *const c_char, value: *const c_char);
+    #[cfg_attr(feature = "dox", doc(cfg(feature = "v2020_7")))]
+    pub fn ostree_bootconfig_parser_get_overlay_initrds(
+        self_: *mut OstreeBootconfigParser,
+    ) -> *mut *mut c_char;
+    pub fn ostree_bootconfig_parser_parse(
+        self_: *mut OstreeBootconfigParser,
+        path: *mut gio::GFile,
+        cancellable: *mut gio::GCancellable,
+        error: *mut *mut glib::GError,
+    ) -> gboolean;
+    pub fn ostree_bootconfig_parser_parse_at(
+        self_: *mut OstreeBootconfigParser,
+        dfd: c_int,
+        path: *const c_char,
+        cancellable: *mut gio::GCancellable,
+        error: *mut *mut glib::GError,
+    ) -> gboolean;
+    pub fn ostree_bootconfig_parser_set(
+        self_: *mut OstreeBootconfigParser,
+        key: *const c_char,
+        value: *const c_char,
+    );
     #[cfg(any(feature = "v2020_7", feature = "dox"))]
-    pub fn ostree_bootconfig_parser_set_overlay_initrds(self_: *mut OstreeBootconfigParser, initrds: *mut *mut c_char);
-    pub fn ostree_bootconfig_parser_write(self_: *mut OstreeBootconfigParser, output: *mut gio::GFile, cancellable: *mut gio::GCancellable, error: *mut *mut glib::GError) -> gboolean;
-    pub fn ostree_bootconfig_parser_write_at(self_: *mut OstreeBootconfigParser, dfd: c_int, path: *const c_char, cancellable: *mut gio::GCancellable, error: *mut *mut glib::GError) -> gboolean;
+    #[cfg_attr(feature = "dox", doc(cfg(feature = "v2020_7")))]
+    pub fn ostree_bootconfig_parser_set_overlay_initrds(
+        self_: *mut OstreeBootconfigParser,
+        initrds: *mut *mut c_char,
+    );
+    pub fn ostree_bootconfig_parser_write(
+        self_: *mut OstreeBootconfigParser,
+        output: *mut gio::GFile,
+        cancellable: *mut gio::GCancellable,
+        error: *mut *mut glib::GError,
+    ) -> gboolean;
+    pub fn ostree_bootconfig_parser_write_at(
+        self_: *mut OstreeBootconfigParser,
+        dfd: c_int,
+        path: *const c_char,
+        cancellable: *mut gio::GCancellable,
+        error: *mut *mut glib::GError,
+    ) -> gboolean;
 
     //=========================================================================
     // OstreeChecksumInputStream
@@ -1215,20 +1543,37 @@ extern "C" {
     // OstreeContentWriter
     //=========================================================================
     pub fn ostree_content_writer_get_type() -> GType;
-    pub fn ostree_content_writer_finish(self_: *mut OstreeContentWriter, cancellable: *mut gio::GCancellable, error: *mut *mut glib::GError) -> *mut c_char;
+    pub fn ostree_content_writer_finish(
+        self_: *mut OstreeContentWriter,
+        cancellable: *mut gio::GCancellable,
+        error: *mut *mut glib::GError,
+    ) -> *mut c_char;
 
     //=========================================================================
     // OstreeDeployment
     //=========================================================================
     pub fn ostree_deployment_get_type() -> GType;
-    pub fn ostree_deployment_new(index: c_int, osname: *const c_char, csum: *const c_char, deployserial: c_int, bootcsum: *const c_char, bootserial: c_int) -> *mut OstreeDeployment;
+    pub fn ostree_deployment_new(
+        index: c_int,
+        osname: *const c_char,
+        csum: *const c_char,
+        deployserial: c_int,
+        bootcsum: *const c_char,
+        bootserial: c_int,
+    ) -> *mut OstreeDeployment;
     #[cfg(any(feature = "v2018_3", feature = "dox"))]
+    #[cfg_attr(feature = "dox", doc(cfg(feature = "v2018_3")))]
     pub fn ostree_deployment_origin_remove_transient_state(origin: *mut glib::GKeyFile);
     #[cfg(any(feature = "v2016_4", feature = "dox"))]
-    pub fn ostree_deployment_unlocked_state_to_string(state: OstreeDeploymentUnlockedState) -> *const c_char;
+    #[cfg_attr(feature = "dox", doc(cfg(feature = "v2016_4")))]
+    pub fn ostree_deployment_unlocked_state_to_string(
+        state: OstreeDeploymentUnlockedState,
+    ) -> *const c_char;
     pub fn ostree_deployment_clone(self_: *mut OstreeDeployment) -> *mut OstreeDeployment;
     pub fn ostree_deployment_equal(ap: gconstpointer, bp: gconstpointer) -> gboolean;
-    pub fn ostree_deployment_get_bootconfig(self_: *mut OstreeDeployment) -> *mut OstreeBootconfigParser;
+    pub fn ostree_deployment_get_bootconfig(
+        self_: *mut OstreeDeployment,
+    ) -> *mut OstreeBootconfigParser;
     pub fn ostree_deployment_get_bootcsum(self_: *mut OstreeDeployment) -> *const c_char;
     pub fn ostree_deployment_get_bootserial(self_: *mut OstreeDeployment) -> c_int;
     pub fn ostree_deployment_get_csum(self_: *mut OstreeDeployment) -> *const c_char;
@@ -1238,13 +1583,21 @@ extern "C" {
     pub fn ostree_deployment_get_origin_relpath(self_: *mut OstreeDeployment) -> *mut c_char;
     pub fn ostree_deployment_get_osname(self_: *mut OstreeDeployment) -> *const c_char;
     #[cfg(any(feature = "v2016_4", feature = "dox"))]
-    pub fn ostree_deployment_get_unlocked(self_: *mut OstreeDeployment) -> OstreeDeploymentUnlockedState;
+    #[cfg_attr(feature = "dox", doc(cfg(feature = "v2016_4")))]
+    pub fn ostree_deployment_get_unlocked(
+        self_: *mut OstreeDeployment,
+    ) -> OstreeDeploymentUnlockedState;
     pub fn ostree_deployment_hash(v: gconstpointer) -> c_uint;
     #[cfg(any(feature = "v2018_3", feature = "dox"))]
+    #[cfg_attr(feature = "dox", doc(cfg(feature = "v2018_3")))]
     pub fn ostree_deployment_is_pinned(self_: *mut OstreeDeployment) -> gboolean;
     #[cfg(any(feature = "v2018_3", feature = "dox"))]
+    #[cfg_attr(feature = "dox", doc(cfg(feature = "v2018_3")))]
     pub fn ostree_deployment_is_staged(self_: *mut OstreeDeployment) -> gboolean;
-    pub fn ostree_deployment_set_bootconfig(self_: *mut OstreeDeployment, bootconfig: *mut OstreeBootconfigParser);
+    pub fn ostree_deployment_set_bootconfig(
+        self_: *mut OstreeDeployment,
+        bootconfig: *mut OstreeBootconfigParser,
+    );
     pub fn ostree_deployment_set_bootserial(self_: *mut OstreeDeployment, index: c_int);
     pub fn ostree_deployment_set_index(self_: *mut OstreeDeployment, index: c_int);
     pub fn ostree_deployment_set_origin(self_: *mut OstreeDeployment, origin: *mut glib::GKeyFile);
@@ -1253,15 +1606,42 @@ extern "C" {
     // OstreeGpgVerifyResult
     //=========================================================================
     pub fn ostree_gpg_verify_result_get_type() -> GType;
-    pub fn ostree_gpg_verify_result_describe_variant(variant: *mut glib::GVariant, output_buffer: *mut glib::GString, line_prefix: *const c_char, flags: OstreeGpgSignatureFormatFlags);
+    pub fn ostree_gpg_verify_result_describe_variant(
+        variant: *mut glib::GVariant,
+        output_buffer: *mut glib::GString,
+        line_prefix: *const c_char,
+        flags: OstreeGpgSignatureFormatFlags,
+    );
     pub fn ostree_gpg_verify_result_count_all(result: *mut OstreeGpgVerifyResult) -> c_uint;
     pub fn ostree_gpg_verify_result_count_valid(result: *mut OstreeGpgVerifyResult) -> c_uint;
-    pub fn ostree_gpg_verify_result_describe(result: *mut OstreeGpgVerifyResult, signature_index: c_uint, output_buffer: *mut glib::GString, line_prefix: *const c_char, flags: OstreeGpgSignatureFormatFlags);
-    pub fn ostree_gpg_verify_result_get(result: *mut OstreeGpgVerifyResult, signature_index: c_uint, attrs: *mut OstreeGpgSignatureAttr, n_attrs: c_uint) -> *mut glib::GVariant;
-    pub fn ostree_gpg_verify_result_get_all(result: *mut OstreeGpgVerifyResult, signature_index: c_uint) -> *mut glib::GVariant;
-    pub fn ostree_gpg_verify_result_lookup(result: *mut OstreeGpgVerifyResult, key_id: *const c_char, out_signature_index: *mut c_uint) -> gboolean;
+    pub fn ostree_gpg_verify_result_describe(
+        result: *mut OstreeGpgVerifyResult,
+        signature_index: c_uint,
+        output_buffer: *mut glib::GString,
+        line_prefix: *const c_char,
+        flags: OstreeGpgSignatureFormatFlags,
+    );
+    pub fn ostree_gpg_verify_result_get(
+        result: *mut OstreeGpgVerifyResult,
+        signature_index: c_uint,
+        attrs: *mut OstreeGpgSignatureAttr,
+        n_attrs: c_uint,
+    ) -> *mut glib::GVariant;
+    pub fn ostree_gpg_verify_result_get_all(
+        result: *mut OstreeGpgVerifyResult,
+        signature_index: c_uint,
+    ) -> *mut glib::GVariant;
+    pub fn ostree_gpg_verify_result_lookup(
+        result: *mut OstreeGpgVerifyResult,
+        key_id: *const c_char,
+        out_signature_index: *mut c_uint,
+    ) -> gboolean;
     #[cfg(any(feature = "v2016_6", feature = "dox"))]
-    pub fn ostree_gpg_verify_result_require_valid_signature(result: *mut OstreeGpgVerifyResult, error: *mut *mut glib::GError) -> gboolean;
+    #[cfg_attr(feature = "dox", doc(cfg(feature = "v2016_6")))]
+    pub fn ostree_gpg_verify_result_require_valid_signature(
+        result: *mut OstreeGpgVerifyResult,
+        error: *mut *mut glib::GError,
+    ) -> gboolean;
 
     //=========================================================================
     // OstreeMutableTree
@@ -1269,24 +1649,83 @@ extern "C" {
     pub fn ostree_mutable_tree_get_type() -> GType;
     pub fn ostree_mutable_tree_new() -> *mut OstreeMutableTree;
     #[cfg(any(feature = "v2018_7", feature = "dox"))]
-    pub fn ostree_mutable_tree_new_from_checksum(repo: *mut OstreeRepo, contents_checksum: *const c_char, metadata_checksum: *const c_char) -> *mut OstreeMutableTree;
+    #[cfg_attr(feature = "dox", doc(cfg(feature = "v2018_7")))]
+    pub fn ostree_mutable_tree_new_from_checksum(
+        repo: *mut OstreeRepo,
+        contents_checksum: *const c_char,
+        metadata_checksum: *const c_char,
+    ) -> *mut OstreeMutableTree;
     #[cfg(any(feature = "v2018_7", feature = "dox"))]
-    pub fn ostree_mutable_tree_check_error(self_: *mut OstreeMutableTree, error: *mut *mut glib::GError) -> gboolean;
-    pub fn ostree_mutable_tree_ensure_dir(self_: *mut OstreeMutableTree, name: *const c_char, out_subdir: *mut *mut OstreeMutableTree, error: *mut *mut glib::GError) -> gboolean;
-    pub fn ostree_mutable_tree_ensure_parent_dirs(self_: *mut OstreeMutableTree, split_path: *mut glib::GPtrArray, metadata_checksum: *const c_char, out_parent: *mut *mut OstreeMutableTree, error: *mut *mut glib::GError) -> gboolean;
+    #[cfg_attr(feature = "dox", doc(cfg(feature = "v2018_7")))]
+    pub fn ostree_mutable_tree_check_error(
+        self_: *mut OstreeMutableTree,
+        error: *mut *mut glib::GError,
+    ) -> gboolean;
+    pub fn ostree_mutable_tree_ensure_dir(
+        self_: *mut OstreeMutableTree,
+        name: *const c_char,
+        out_subdir: *mut *mut OstreeMutableTree,
+        error: *mut *mut glib::GError,
+    ) -> gboolean;
+    pub fn ostree_mutable_tree_ensure_parent_dirs(
+        self_: *mut OstreeMutableTree,
+        split_path: *mut glib::GPtrArray,
+        metadata_checksum: *const c_char,
+        out_parent: *mut *mut OstreeMutableTree,
+        error: *mut *mut glib::GError,
+    ) -> gboolean;
     #[cfg(any(feature = "v2018_7", feature = "dox"))]
-    pub fn ostree_mutable_tree_fill_empty_from_dirtree(self_: *mut OstreeMutableTree, repo: *mut OstreeRepo, contents_checksum: *const c_char, metadata_checksum: *const c_char) -> gboolean;
-    pub fn ostree_mutable_tree_get_contents_checksum(self_: *mut OstreeMutableTree) -> *const c_char;
+    #[cfg_attr(feature = "dox", doc(cfg(feature = "v2018_7")))]
+    pub fn ostree_mutable_tree_fill_empty_from_dirtree(
+        self_: *mut OstreeMutableTree,
+        repo: *mut OstreeRepo,
+        contents_checksum: *const c_char,
+        metadata_checksum: *const c_char,
+    ) -> gboolean;
+    pub fn ostree_mutable_tree_get_contents_checksum(
+        self_: *mut OstreeMutableTree,
+    ) -> *const c_char;
     pub fn ostree_mutable_tree_get_files(self_: *mut OstreeMutableTree) -> *mut glib::GHashTable;
-    pub fn ostree_mutable_tree_get_metadata_checksum(self_: *mut OstreeMutableTree) -> *const c_char;
+    pub fn ostree_mutable_tree_get_metadata_checksum(
+        self_: *mut OstreeMutableTree,
+    ) -> *const c_char;
     pub fn ostree_mutable_tree_get_subdirs(self_: *mut OstreeMutableTree) -> *mut glib::GHashTable;
-    pub fn ostree_mutable_tree_lookup(self_: *mut OstreeMutableTree, name: *const c_char, out_file_checksum: *mut *mut c_char, out_subdir: *mut *mut OstreeMutableTree, error: *mut *mut glib::GError) -> gboolean;
+    pub fn ostree_mutable_tree_lookup(
+        self_: *mut OstreeMutableTree,
+        name: *const c_char,
+        out_file_checksum: *mut *mut c_char,
+        out_subdir: *mut *mut OstreeMutableTree,
+        error: *mut *mut glib::GError,
+    ) -> gboolean;
     #[cfg(any(feature = "v2018_9", feature = "dox"))]
-    pub fn ostree_mutable_tree_remove(self_: *mut OstreeMutableTree, name: *const c_char, allow_noent: gboolean, error: *mut *mut glib::GError) -> gboolean;
-    pub fn ostree_mutable_tree_replace_file(self_: *mut OstreeMutableTree, name: *const c_char, checksum: *const c_char, error: *mut *mut glib::GError) -> gboolean;
-    pub fn ostree_mutable_tree_set_contents_checksum(self_: *mut OstreeMutableTree, checksum: *const c_char);
-    pub fn ostree_mutable_tree_set_metadata_checksum(self_: *mut OstreeMutableTree, checksum: *const c_char);
-    pub fn ostree_mutable_tree_walk(self_: *mut OstreeMutableTree, split_path: *mut glib::GPtrArray, start: c_uint, out_subdir: *mut *mut OstreeMutableTree, error: *mut *mut glib::GError) -> gboolean;
+    #[cfg_attr(feature = "dox", doc(cfg(feature = "v2018_9")))]
+    pub fn ostree_mutable_tree_remove(
+        self_: *mut OstreeMutableTree,
+        name: *const c_char,
+        allow_noent: gboolean,
+        error: *mut *mut glib::GError,
+    ) -> gboolean;
+    pub fn ostree_mutable_tree_replace_file(
+        self_: *mut OstreeMutableTree,
+        name: *const c_char,
+        checksum: *const c_char,
+        error: *mut *mut glib::GError,
+    ) -> gboolean;
+    pub fn ostree_mutable_tree_set_contents_checksum(
+        self_: *mut OstreeMutableTree,
+        checksum: *const c_char,
+    );
+    pub fn ostree_mutable_tree_set_metadata_checksum(
+        self_: *mut OstreeMutableTree,
+        checksum: *const c_char,
+    );
+    pub fn ostree_mutable_tree_walk(
+        self_: *mut OstreeMutableTree,
+        split_path: *mut glib::GPtrArray,
+        start: c_uint,
+        out_subdir: *mut *mut OstreeMutableTree,
+        error: *mut *mut glib::GError,
+    ) -> gboolean;
 
     //=========================================================================
     // OstreeRepo
@@ -1294,220 +1733,1087 @@ extern "C" {
     pub fn ostree_repo_get_type() -> GType;
     pub fn ostree_repo_new(path: *mut gio::GFile) -> *mut OstreeRepo;
     pub fn ostree_repo_new_default() -> *mut OstreeRepo;
-    pub fn ostree_repo_new_for_sysroot_path(repo_path: *mut gio::GFile, sysroot_path: *mut gio::GFile) -> *mut OstreeRepo;
+    pub fn ostree_repo_new_for_sysroot_path(
+        repo_path: *mut gio::GFile,
+        sysroot_path: *mut gio::GFile,
+    ) -> *mut OstreeRepo;
     #[cfg(any(feature = "v2017_10", feature = "dox"))]
-    pub fn ostree_repo_create_at(dfd: c_int, path: *const c_char, mode: OstreeRepoMode, options: *mut glib::GVariant, cancellable: *mut gio::GCancellable, error: *mut *mut glib::GError) -> *mut OstreeRepo;
-    pub fn ostree_repo_mode_from_string(mode: *const c_char, out_mode: *mut OstreeRepoMode, error: *mut *mut glib::GError) -> gboolean;
+    #[cfg_attr(feature = "dox", doc(cfg(feature = "v2017_10")))]
+    pub fn ostree_repo_create_at(
+        dfd: c_int,
+        path: *const c_char,
+        mode: OstreeRepoMode,
+        options: *mut glib::GVariant,
+        cancellable: *mut gio::GCancellable,
+        error: *mut *mut glib::GError,
+    ) -> *mut OstreeRepo;
+    pub fn ostree_repo_mode_from_string(
+        mode: *const c_char,
+        out_mode: *mut OstreeRepoMode,
+        error: *mut *mut glib::GError,
+    ) -> gboolean;
     #[cfg(any(feature = "v2017_10", feature = "dox"))]
-    pub fn ostree_repo_open_at(dfd: c_int, path: *const c_char, cancellable: *mut gio::GCancellable, error: *mut *mut glib::GError) -> *mut OstreeRepo;
-    pub fn ostree_repo_pull_default_console_progress_changed(progress: *mut OstreeAsyncProgress, user_data: gpointer);
+    #[cfg_attr(feature = "dox", doc(cfg(feature = "v2017_10")))]
+    pub fn ostree_repo_open_at(
+        dfd: c_int,
+        path: *const c_char,
+        cancellable: *mut gio::GCancellable,
+        error: *mut *mut glib::GError,
+    ) -> *mut OstreeRepo;
+    pub fn ostree_repo_pull_default_console_progress_changed(
+        progress: *mut OstreeAsyncProgress,
+        user_data: gpointer,
+    );
     #[cfg(any(feature = "v2018_5", feature = "dox"))]
+    #[cfg_attr(feature = "dox", doc(cfg(feature = "v2018_5")))]
     pub fn ostree_repo_traverse_new_parents() -> *mut glib::GHashTable;
     pub fn ostree_repo_traverse_new_reachable() -> *mut glib::GHashTable;
     #[cfg(any(feature = "v2018_5", feature = "dox"))]
-    pub fn ostree_repo_traverse_parents_get_commits(parents: *mut glib::GHashTable, object: *mut glib::GVariant) -> *mut *mut c_char;
-    pub fn ostree_repo_abort_transaction(self_: *mut OstreeRepo, cancellable: *mut gio::GCancellable, error: *mut *mut glib::GError) -> gboolean;
-    pub fn ostree_repo_add_gpg_signature_summary(self_: *mut OstreeRepo, key_id: *mut *const c_char, homedir: *const c_char, cancellable: *mut gio::GCancellable, error: *mut *mut glib::GError) -> gboolean;
-    pub fn ostree_repo_append_gpg_signature(self_: *mut OstreeRepo, commit_checksum: *const c_char, signature_bytes: *mut glib::GBytes, cancellable: *mut gio::GCancellable, error: *mut *mut glib::GError) -> gboolean;
+    #[cfg_attr(feature = "dox", doc(cfg(feature = "v2018_5")))]
+    pub fn ostree_repo_traverse_parents_get_commits(
+        parents: *mut glib::GHashTable,
+        object: *mut glib::GVariant,
+    ) -> *mut *mut c_char;
+    pub fn ostree_repo_abort_transaction(
+        self_: *mut OstreeRepo,
+        cancellable: *mut gio::GCancellable,
+        error: *mut *mut glib::GError,
+    ) -> gboolean;
+    pub fn ostree_repo_add_gpg_signature_summary(
+        self_: *mut OstreeRepo,
+        key_id: *mut *const c_char,
+        homedir: *const c_char,
+        cancellable: *mut gio::GCancellable,
+        error: *mut *mut glib::GError,
+    ) -> gboolean;
+    pub fn ostree_repo_append_gpg_signature(
+        self_: *mut OstreeRepo,
+        commit_checksum: *const c_char,
+        signature_bytes: *mut glib::GBytes,
+        cancellable: *mut gio::GCancellable,
+        error: *mut *mut glib::GError,
+    ) -> gboolean;
     #[cfg(any(feature = "v2016_8", feature = "dox"))]
-    pub fn ostree_repo_checkout_at(self_: *mut OstreeRepo, options: *mut OstreeRepoCheckoutAtOptions, destination_dfd: c_int, destination_path: *const c_char, commit: *const c_char, cancellable: *mut gio::GCancellable, error: *mut *mut glib::GError) -> gboolean;
-    pub fn ostree_repo_checkout_gc(self_: *mut OstreeRepo, cancellable: *mut gio::GCancellable, error: *mut *mut glib::GError) -> gboolean;
-    pub fn ostree_repo_checkout_tree(self_: *mut OstreeRepo, mode: OstreeRepoCheckoutMode, overwrite_mode: OstreeRepoCheckoutOverwriteMode, destination: *mut gio::GFile, source: *mut OstreeRepoFile, source_info: *mut gio::GFileInfo, cancellable: *mut gio::GCancellable, error: *mut *mut glib::GError) -> gboolean;
-    pub fn ostree_repo_checkout_tree_at(self_: *mut OstreeRepo, options: *mut OstreeRepoCheckoutOptions, destination_dfd: c_int, destination_path: *const c_char, commit: *const c_char, cancellable: *mut gio::GCancellable, error: *mut *mut glib::GError) -> gboolean;
-    pub fn ostree_repo_commit_transaction(self_: *mut OstreeRepo, out_stats: *mut OstreeRepoTransactionStats, cancellable: *mut gio::GCancellable, error: *mut *mut glib::GError) -> gboolean;
+    #[cfg_attr(feature = "dox", doc(cfg(feature = "v2016_8")))]
+    pub fn ostree_repo_checkout_at(
+        self_: *mut OstreeRepo,
+        options: *mut OstreeRepoCheckoutAtOptions,
+        destination_dfd: c_int,
+        destination_path: *const c_char,
+        commit: *const c_char,
+        cancellable: *mut gio::GCancellable,
+        error: *mut *mut glib::GError,
+    ) -> gboolean;
+    pub fn ostree_repo_checkout_gc(
+        self_: *mut OstreeRepo,
+        cancellable: *mut gio::GCancellable,
+        error: *mut *mut glib::GError,
+    ) -> gboolean;
+    pub fn ostree_repo_checkout_tree(
+        self_: *mut OstreeRepo,
+        mode: OstreeRepoCheckoutMode,
+        overwrite_mode: OstreeRepoCheckoutOverwriteMode,
+        destination: *mut gio::GFile,
+        source: *mut OstreeRepoFile,
+        source_info: *mut gio::GFileInfo,
+        cancellable: *mut gio::GCancellable,
+        error: *mut *mut glib::GError,
+    ) -> gboolean;
+    pub fn ostree_repo_checkout_tree_at(
+        self_: *mut OstreeRepo,
+        options: *mut OstreeRepoCheckoutOptions,
+        destination_dfd: c_int,
+        destination_path: *const c_char,
+        commit: *const c_char,
+        cancellable: *mut gio::GCancellable,
+        error: *mut *mut glib::GError,
+    ) -> gboolean;
+    pub fn ostree_repo_commit_transaction(
+        self_: *mut OstreeRepo,
+        out_stats: *mut OstreeRepoTransactionStats,
+        cancellable: *mut gio::GCancellable,
+        error: *mut *mut glib::GError,
+    ) -> gboolean;
     pub fn ostree_repo_copy_config(self_: *mut OstreeRepo) -> *mut glib::GKeyFile;
-    pub fn ostree_repo_create(self_: *mut OstreeRepo, mode: OstreeRepoMode, cancellable: *mut gio::GCancellable, error: *mut *mut glib::GError) -> gboolean;
-    pub fn ostree_repo_delete_object(self_: *mut OstreeRepo, objtype: OstreeObjectType, sha256: *const c_char, cancellable: *mut gio::GCancellable, error: *mut *mut glib::GError) -> gboolean;
+    pub fn ostree_repo_create(
+        self_: *mut OstreeRepo,
+        mode: OstreeRepoMode,
+        cancellable: *mut gio::GCancellable,
+        error: *mut *mut glib::GError,
+    ) -> gboolean;
+    pub fn ostree_repo_delete_object(
+        self_: *mut OstreeRepo,
+        objtype: OstreeObjectType,
+        sha256: *const c_char,
+        cancellable: *mut gio::GCancellable,
+        error: *mut *mut glib::GError,
+    ) -> gboolean;
     #[cfg(any(feature = "v2017_12", feature = "dox"))]
+    #[cfg_attr(feature = "dox", doc(cfg(feature = "v2017_12")))]
     pub fn ostree_repo_equal(a: *mut OstreeRepo, b: *mut OstreeRepo) -> gboolean;
-    pub fn ostree_repo_export_tree_to_archive(self_: *mut OstreeRepo, opts: *mut OstreeRepoExportArchiveOptions, root: *mut OstreeRepoFile, archive: *mut c_void, cancellable: *mut gio::GCancellable, error: *mut *mut glib::GError) -> gboolean;
+    pub fn ostree_repo_export_tree_to_archive(
+        self_: *mut OstreeRepo,
+        opts: *mut OstreeRepoExportArchiveOptions,
+        root: *mut OstreeRepoFile,
+        archive: *mut c_void,
+        cancellable: *mut gio::GCancellable,
+        error: *mut *mut glib::GError,
+    ) -> gboolean;
     #[cfg(any(feature = "v2018_6", feature = "dox"))]
-    pub fn ostree_repo_find_remotes_async(self_: *mut OstreeRepo, refs: *const *const OstreeCollectionRef, options: *mut glib::GVariant, finders: *mut *mut OstreeRepoFinder, progress: *mut OstreeAsyncProgress, cancellable: *mut gio::GCancellable, callback: gio::GAsyncReadyCallback, user_data: gpointer);
+    #[cfg_attr(feature = "dox", doc(cfg(feature = "v2018_6")))]
+    pub fn ostree_repo_find_remotes_async(
+        self_: *mut OstreeRepo,
+        refs: *const *const OstreeCollectionRef,
+        options: *mut glib::GVariant,
+        finders: *mut *mut OstreeRepoFinder,
+        progress: *mut OstreeAsyncProgress,
+        cancellable: *mut gio::GCancellable,
+        callback: gio::GAsyncReadyCallback,
+        user_data: gpointer,
+    );
     #[cfg(any(feature = "v2018_6", feature = "dox"))]
-    pub fn ostree_repo_find_remotes_finish(self_: *mut OstreeRepo, result: *mut gio::GAsyncResult, error: *mut *mut glib::GError) -> *mut *mut OstreeRepoFinderResult;
+    #[cfg_attr(feature = "dox", doc(cfg(feature = "v2018_6")))]
+    pub fn ostree_repo_find_remotes_finish(
+        self_: *mut OstreeRepo,
+        result: *mut gio::GAsyncResult,
+        error: *mut *mut glib::GError,
+    ) -> *mut *mut OstreeRepoFinderResult;
     #[cfg(any(feature = "v2017_15", feature = "dox"))]
-    pub fn ostree_repo_fsck_object(self_: *mut OstreeRepo, objtype: OstreeObjectType, sha256: *const c_char, cancellable: *mut gio::GCancellable, error: *mut *mut glib::GError) -> gboolean;
+    #[cfg_attr(feature = "dox", doc(cfg(feature = "v2017_15")))]
+    pub fn ostree_repo_fsck_object(
+        self_: *mut OstreeRepo,
+        objtype: OstreeObjectType,
+        sha256: *const c_char,
+        cancellable: *mut gio::GCancellable,
+        error: *mut *mut glib::GError,
+    ) -> gboolean;
     #[cfg(any(feature = "v2019_2", feature = "dox"))]
+    #[cfg_attr(feature = "dox", doc(cfg(feature = "v2019_2")))]
     pub fn ostree_repo_get_bootloader(self_: *mut OstreeRepo) -> *const c_char;
     #[cfg(any(feature = "v2018_6", feature = "dox"))]
+    #[cfg_attr(feature = "dox", doc(cfg(feature = "v2018_6")))]
     pub fn ostree_repo_get_collection_id(self_: *mut OstreeRepo) -> *const c_char;
     pub fn ostree_repo_get_config(self_: *mut OstreeRepo) -> *mut glib::GKeyFile;
     #[cfg(any(feature = "v2018_9", feature = "dox"))]
+    #[cfg_attr(feature = "dox", doc(cfg(feature = "v2018_9")))]
     pub fn ostree_repo_get_default_repo_finders(self_: *mut OstreeRepo) -> *const *const c_char;
     #[cfg(any(feature = "v2016_4", feature = "dox"))]
+    #[cfg_attr(feature = "dox", doc(cfg(feature = "v2016_4")))]
     pub fn ostree_repo_get_dfd(self_: *mut OstreeRepo) -> c_int;
     pub fn ostree_repo_get_disable_fsync(self_: *mut OstreeRepo) -> gboolean;
     #[cfg(any(feature = "v2018_9", feature = "dox"))]
-    pub fn ostree_repo_get_min_free_space_bytes(self_: *mut OstreeRepo, out_reserved_bytes: *mut u64, error: *mut *mut glib::GError) -> gboolean;
+    #[cfg_attr(feature = "dox", doc(cfg(feature = "v2018_9")))]
+    pub fn ostree_repo_get_min_free_space_bytes(
+        self_: *mut OstreeRepo,
+        out_reserved_bytes: *mut u64,
+        error: *mut *mut glib::GError,
+    ) -> gboolean;
     pub fn ostree_repo_get_mode(self_: *mut OstreeRepo) -> OstreeRepoMode;
     pub fn ostree_repo_get_parent(self_: *mut OstreeRepo) -> *mut OstreeRepo;
     pub fn ostree_repo_get_path(self_: *mut OstreeRepo) -> *mut gio::GFile;
     #[cfg(any(feature = "v2016_5", feature = "dox"))]
-    pub fn ostree_repo_get_remote_boolean_option(self_: *mut OstreeRepo, remote_name: *const c_char, option_name: *const c_char, default_value: gboolean, out_value: *mut gboolean, error: *mut *mut glib::GError) -> gboolean;
+    #[cfg_attr(feature = "dox", doc(cfg(feature = "v2016_5")))]
+    pub fn ostree_repo_get_remote_boolean_option(
+        self_: *mut OstreeRepo,
+        remote_name: *const c_char,
+        option_name: *const c_char,
+        default_value: gboolean,
+        out_value: *mut gboolean,
+        error: *mut *mut glib::GError,
+    ) -> gboolean;
     #[cfg(any(feature = "v2016_5", feature = "dox"))]
-    pub fn ostree_repo_get_remote_list_option(self_: *mut OstreeRepo, remote_name: *const c_char, option_name: *const c_char, out_value: *mut *mut *mut c_char, error: *mut *mut glib::GError) -> gboolean;
+    #[cfg_attr(feature = "dox", doc(cfg(feature = "v2016_5")))]
+    pub fn ostree_repo_get_remote_list_option(
+        self_: *mut OstreeRepo,
+        remote_name: *const c_char,
+        option_name: *const c_char,
+        out_value: *mut *mut *mut c_char,
+        error: *mut *mut glib::GError,
+    ) -> gboolean;
     #[cfg(any(feature = "v2016_5", feature = "dox"))]
-    pub fn ostree_repo_get_remote_option(self_: *mut OstreeRepo, remote_name: *const c_char, option_name: *const c_char, default_value: *const c_char, out_value: *mut *mut c_char, error: *mut *mut glib::GError) -> gboolean;
+    #[cfg_attr(feature = "dox", doc(cfg(feature = "v2016_5")))]
+    pub fn ostree_repo_get_remote_option(
+        self_: *mut OstreeRepo,
+        remote_name: *const c_char,
+        option_name: *const c_char,
+        default_value: *const c_char,
+        out_value: *mut *mut c_char,
+        error: *mut *mut glib::GError,
+    ) -> gboolean;
     #[cfg(any(feature = "v2020_8", feature = "dox"))]
-    pub fn ostree_repo_gpg_sign_data(self_: *mut OstreeRepo, data: *mut glib::GBytes, old_signatures: *mut glib::GBytes, key_id: *mut *const c_char, homedir: *const c_char, out_signatures: *mut *mut glib::GBytes, cancellable: *mut gio::GCancellable, error: *mut *mut glib::GError) -> gboolean;
+    #[cfg_attr(feature = "dox", doc(cfg(feature = "v2020_8")))]
+    pub fn ostree_repo_gpg_sign_data(
+        self_: *mut OstreeRepo,
+        data: *mut glib::GBytes,
+        old_signatures: *mut glib::GBytes,
+        key_id: *mut *const c_char,
+        homedir: *const c_char,
+        out_signatures: *mut *mut glib::GBytes,
+        cancellable: *mut gio::GCancellable,
+        error: *mut *mut glib::GError,
+    ) -> gboolean;
     #[cfg(any(feature = "v2016_6", feature = "dox"))]
-    pub fn ostree_repo_gpg_verify_data(self_: *mut OstreeRepo, remote_name: *const c_char, data: *mut glib::GBytes, signatures: *mut glib::GBytes, keyringdir: *mut gio::GFile, extra_keyring: *mut gio::GFile, cancellable: *mut gio::GCancellable, error: *mut *mut glib::GError) -> *mut OstreeGpgVerifyResult;
-    pub fn ostree_repo_has_object(self_: *mut OstreeRepo, objtype: OstreeObjectType, checksum: *const c_char, out_have_object: *mut gboolean, cancellable: *mut gio::GCancellable, error: *mut *mut glib::GError) -> gboolean;
+    #[cfg_attr(feature = "dox", doc(cfg(feature = "v2016_6")))]
+    pub fn ostree_repo_gpg_verify_data(
+        self_: *mut OstreeRepo,
+        remote_name: *const c_char,
+        data: *mut glib::GBytes,
+        signatures: *mut glib::GBytes,
+        keyringdir: *mut gio::GFile,
+        extra_keyring: *mut gio::GFile,
+        cancellable: *mut gio::GCancellable,
+        error: *mut *mut glib::GError,
+    ) -> *mut OstreeGpgVerifyResult;
+    pub fn ostree_repo_has_object(
+        self_: *mut OstreeRepo,
+        objtype: OstreeObjectType,
+        checksum: *const c_char,
+        out_have_object: *mut gboolean,
+        cancellable: *mut gio::GCancellable,
+        error: *mut *mut glib::GError,
+    ) -> gboolean;
     #[cfg(any(feature = "v2017_12", feature = "dox"))]
+    #[cfg_attr(feature = "dox", doc(cfg(feature = "v2017_12")))]
     pub fn ostree_repo_hash(self_: *mut OstreeRepo) -> c_uint;
-    pub fn ostree_repo_import_archive_to_mtree(self_: *mut OstreeRepo, opts: *mut OstreeRepoImportArchiveOptions, archive: *mut c_void, mtree: *mut OstreeMutableTree, modifier: *mut OstreeRepoCommitModifier, cancellable: *mut gio::GCancellable, error: *mut *mut glib::GError) -> gboolean;
-    pub fn ostree_repo_import_object_from(self_: *mut OstreeRepo, source: *mut OstreeRepo, objtype: OstreeObjectType, checksum: *const c_char, cancellable: *mut gio::GCancellable, error: *mut *mut glib::GError) -> gboolean;
+    pub fn ostree_repo_import_archive_to_mtree(
+        self_: *mut OstreeRepo,
+        opts: *mut OstreeRepoImportArchiveOptions,
+        archive: *mut c_void,
+        mtree: *mut OstreeMutableTree,
+        modifier: *mut OstreeRepoCommitModifier,
+        cancellable: *mut gio::GCancellable,
+        error: *mut *mut glib::GError,
+    ) -> gboolean;
+    pub fn ostree_repo_import_object_from(
+        self_: *mut OstreeRepo,
+        source: *mut OstreeRepo,
+        objtype: OstreeObjectType,
+        checksum: *const c_char,
+        cancellable: *mut gio::GCancellable,
+        error: *mut *mut glib::GError,
+    ) -> gboolean;
     #[cfg(any(feature = "v2016_5", feature = "dox"))]
-    pub fn ostree_repo_import_object_from_with_trust(self_: *mut OstreeRepo, source: *mut OstreeRepo, objtype: OstreeObjectType, checksum: *const c_char, trusted: gboolean, cancellable: *mut gio::GCancellable, error: *mut *mut glib::GError) -> gboolean;
+    #[cfg_attr(feature = "dox", doc(cfg(feature = "v2016_5")))]
+    pub fn ostree_repo_import_object_from_with_trust(
+        self_: *mut OstreeRepo,
+        source: *mut OstreeRepo,
+        objtype: OstreeObjectType,
+        checksum: *const c_char,
+        trusted: gboolean,
+        cancellable: *mut gio::GCancellable,
+        error: *mut *mut glib::GError,
+    ) -> gboolean;
     pub fn ostree_repo_is_system(repo: *mut OstreeRepo) -> gboolean;
-    pub fn ostree_repo_is_writable(self_: *mut OstreeRepo, error: *mut *mut glib::GError) -> gboolean;
+    pub fn ostree_repo_is_writable(
+        self_: *mut OstreeRepo,
+        error: *mut *mut glib::GError,
+    ) -> gboolean;
     #[cfg(any(feature = "v2018_6", feature = "dox"))]
-    pub fn ostree_repo_list_collection_refs(self_: *mut OstreeRepo, match_collection_id: *const c_char, out_all_refs: *mut *mut glib::GHashTable, flags: OstreeRepoListRefsExtFlags, cancellable: *mut gio::GCancellable, error: *mut *mut glib::GError) -> gboolean;
-    pub fn ostree_repo_list_commit_objects_starting_with(self_: *mut OstreeRepo, start: *const c_char, out_commits: *mut *mut glib::GHashTable, cancellable: *mut gio::GCancellable, error: *mut *mut glib::GError) -> gboolean;
-    pub fn ostree_repo_list_objects(self_: *mut OstreeRepo, flags: OstreeRepoListObjectsFlags, out_objects: *mut *mut glib::GHashTable, cancellable: *mut gio::GCancellable, error: *mut *mut glib::GError) -> gboolean;
-    pub fn ostree_repo_list_refs(self_: *mut OstreeRepo, refspec_prefix: *const c_char, out_all_refs: *mut *mut glib::GHashTable, cancellable: *mut gio::GCancellable, error: *mut *mut glib::GError) -> gboolean;
+    #[cfg_attr(feature = "dox", doc(cfg(feature = "v2018_6")))]
+    pub fn ostree_repo_list_collection_refs(
+        self_: *mut OstreeRepo,
+        match_collection_id: *const c_char,
+        out_all_refs: *mut *mut glib::GHashTable,
+        flags: OstreeRepoListRefsExtFlags,
+        cancellable: *mut gio::GCancellable,
+        error: *mut *mut glib::GError,
+    ) -> gboolean;
+    pub fn ostree_repo_list_commit_objects_starting_with(
+        self_: *mut OstreeRepo,
+        start: *const c_char,
+        out_commits: *mut *mut glib::GHashTable,
+        cancellable: *mut gio::GCancellable,
+        error: *mut *mut glib::GError,
+    ) -> gboolean;
+    pub fn ostree_repo_list_objects(
+        self_: *mut OstreeRepo,
+        flags: OstreeRepoListObjectsFlags,
+        out_objects: *mut *mut glib::GHashTable,
+        cancellable: *mut gio::GCancellable,
+        error: *mut *mut glib::GError,
+    ) -> gboolean;
+    pub fn ostree_repo_list_refs(
+        self_: *mut OstreeRepo,
+        refspec_prefix: *const c_char,
+        out_all_refs: *mut *mut glib::GHashTable,
+        cancellable: *mut gio::GCancellable,
+        error: *mut *mut glib::GError,
+    ) -> gboolean;
     #[cfg(any(feature = "v2016_4", feature = "dox"))]
-    pub fn ostree_repo_list_refs_ext(self_: *mut OstreeRepo, refspec_prefix: *const c_char, out_all_refs: *mut *mut glib::GHashTable, flags: OstreeRepoListRefsExtFlags, cancellable: *mut gio::GCancellable, error: *mut *mut glib::GError) -> gboolean;
+    #[cfg_attr(feature = "dox", doc(cfg(feature = "v2016_4")))]
+    pub fn ostree_repo_list_refs_ext(
+        self_: *mut OstreeRepo,
+        refspec_prefix: *const c_char,
+        out_all_refs: *mut *mut glib::GHashTable,
+        flags: OstreeRepoListRefsExtFlags,
+        cancellable: *mut gio::GCancellable,
+        error: *mut *mut glib::GError,
+    ) -> gboolean;
     #[cfg(any(feature = "v2020_8", feature = "dox"))]
-    pub fn ostree_repo_list_static_delta_indexes(self_: *mut OstreeRepo, out_indexes: *mut *mut glib::GPtrArray, cancellable: *mut gio::GCancellable, error: *mut *mut glib::GError) -> gboolean;
-    pub fn ostree_repo_list_static_delta_names(self_: *mut OstreeRepo, out_deltas: *mut *mut glib::GPtrArray, cancellable: *mut gio::GCancellable, error: *mut *mut glib::GError) -> gboolean;
+    #[cfg_attr(feature = "dox", doc(cfg(feature = "v2020_8")))]
+    pub fn ostree_repo_list_static_delta_indexes(
+        self_: *mut OstreeRepo,
+        out_indexes: *mut *mut glib::GPtrArray,
+        cancellable: *mut gio::GCancellable,
+        error: *mut *mut glib::GError,
+    ) -> gboolean;
+    pub fn ostree_repo_list_static_delta_names(
+        self_: *mut OstreeRepo,
+        out_deltas: *mut *mut glib::GPtrArray,
+        cancellable: *mut gio::GCancellable,
+        error: *mut *mut glib::GError,
+    ) -> gboolean;
     #[cfg(any(feature = "v2015_7", feature = "dox"))]
-    pub fn ostree_repo_load_commit(self_: *mut OstreeRepo, checksum: *const c_char, out_commit: *mut *mut glib::GVariant, out_state: *mut OstreeRepoCommitState, error: *mut *mut glib::GError) -> gboolean;
-    pub fn ostree_repo_load_file(self_: *mut OstreeRepo, checksum: *const c_char, out_input: *mut *mut gio::GInputStream, out_file_info: *mut *mut gio::GFileInfo, out_xattrs: *mut *mut glib::GVariant, cancellable: *mut gio::GCancellable, error: *mut *mut glib::GError) -> gboolean;
-    pub fn ostree_repo_load_object_stream(self_: *mut OstreeRepo, objtype: OstreeObjectType, checksum: *const c_char, out_input: *mut *mut gio::GInputStream, out_size: *mut u64, cancellable: *mut gio::GCancellable, error: *mut *mut glib::GError) -> gboolean;
-    pub fn ostree_repo_load_variant(self_: *mut OstreeRepo, objtype: OstreeObjectType, sha256: *const c_char, out_variant: *mut *mut glib::GVariant, error: *mut *mut glib::GError) -> gboolean;
-    pub fn ostree_repo_load_variant_if_exists(self_: *mut OstreeRepo, objtype: OstreeObjectType, sha256: *const c_char, out_variant: *mut *mut glib::GVariant, error: *mut *mut glib::GError) -> gboolean;
+    #[cfg_attr(feature = "dox", doc(cfg(feature = "v2015_7")))]
+    pub fn ostree_repo_load_commit(
+        self_: *mut OstreeRepo,
+        checksum: *const c_char,
+        out_commit: *mut *mut glib::GVariant,
+        out_state: *mut OstreeRepoCommitState,
+        error: *mut *mut glib::GError,
+    ) -> gboolean;
+    pub fn ostree_repo_load_file(
+        self_: *mut OstreeRepo,
+        checksum: *const c_char,
+        out_input: *mut *mut gio::GInputStream,
+        out_file_info: *mut *mut gio::GFileInfo,
+        out_xattrs: *mut *mut glib::GVariant,
+        cancellable: *mut gio::GCancellable,
+        error: *mut *mut glib::GError,
+    ) -> gboolean;
+    pub fn ostree_repo_load_object_stream(
+        self_: *mut OstreeRepo,
+        objtype: OstreeObjectType,
+        checksum: *const c_char,
+        out_input: *mut *mut gio::GInputStream,
+        out_size: *mut u64,
+        cancellable: *mut gio::GCancellable,
+        error: *mut *mut glib::GError,
+    ) -> gboolean;
+    pub fn ostree_repo_load_variant(
+        self_: *mut OstreeRepo,
+        objtype: OstreeObjectType,
+        sha256: *const c_char,
+        out_variant: *mut *mut glib::GVariant,
+        error: *mut *mut glib::GError,
+    ) -> gboolean;
+    pub fn ostree_repo_load_variant_if_exists(
+        self_: *mut OstreeRepo,
+        objtype: OstreeObjectType,
+        sha256: *const c_char,
+        out_variant: *mut *mut glib::GVariant,
+        error: *mut *mut glib::GError,
+    ) -> gboolean;
     #[cfg(any(feature = "v2017_15", feature = "dox"))]
-    pub fn ostree_repo_mark_commit_partial(self_: *mut OstreeRepo, checksum: *const c_char, is_partial: gboolean, error: *mut *mut glib::GError) -> gboolean;
+    #[cfg_attr(feature = "dox", doc(cfg(feature = "v2017_15")))]
+    pub fn ostree_repo_mark_commit_partial(
+        self_: *mut OstreeRepo,
+        checksum: *const c_char,
+        is_partial: gboolean,
+        error: *mut *mut glib::GError,
+    ) -> gboolean;
     #[cfg(any(feature = "v2019_4", feature = "dox"))]
-    pub fn ostree_repo_mark_commit_partial_reason(self_: *mut OstreeRepo, checksum: *const c_char, is_partial: gboolean, in_state: OstreeRepoCommitState, error: *mut *mut glib::GError) -> gboolean;
-    pub fn ostree_repo_open(self_: *mut OstreeRepo, cancellable: *mut gio::GCancellable, error: *mut *mut glib::GError) -> gboolean;
-    pub fn ostree_repo_prepare_transaction(self_: *mut OstreeRepo, out_transaction_resume: *mut gboolean, cancellable: *mut gio::GCancellable, error: *mut *mut glib::GError) -> gboolean;
-    pub fn ostree_repo_prune(self_: *mut OstreeRepo, flags: OstreeRepoPruneFlags, depth: c_int, out_objects_total: *mut c_int, out_objects_pruned: *mut c_int, out_pruned_object_size_total: *mut u64, cancellable: *mut gio::GCancellable, error: *mut *mut glib::GError) -> gboolean;
+    #[cfg_attr(feature = "dox", doc(cfg(feature = "v2019_4")))]
+    pub fn ostree_repo_mark_commit_partial_reason(
+        self_: *mut OstreeRepo,
+        checksum: *const c_char,
+        is_partial: gboolean,
+        in_state: OstreeRepoCommitState,
+        error: *mut *mut glib::GError,
+    ) -> gboolean;
+    pub fn ostree_repo_open(
+        self_: *mut OstreeRepo,
+        cancellable: *mut gio::GCancellable,
+        error: *mut *mut glib::GError,
+    ) -> gboolean;
+    pub fn ostree_repo_prepare_transaction(
+        self_: *mut OstreeRepo,
+        out_transaction_resume: *mut gboolean,
+        cancellable: *mut gio::GCancellable,
+        error: *mut *mut glib::GError,
+    ) -> gboolean;
+    pub fn ostree_repo_prune(
+        self_: *mut OstreeRepo,
+        flags: OstreeRepoPruneFlags,
+        depth: c_int,
+        out_objects_total: *mut c_int,
+        out_objects_pruned: *mut c_int,
+        out_pruned_object_size_total: *mut u64,
+        cancellable: *mut gio::GCancellable,
+        error: *mut *mut glib::GError,
+    ) -> gboolean;
     #[cfg(any(feature = "v2017_1", feature = "dox"))]
-    pub fn ostree_repo_prune_from_reachable(self_: *mut OstreeRepo, options: *mut OstreeRepoPruneOptions, out_objects_total: *mut c_int, out_objects_pruned: *mut c_int, out_pruned_object_size_total: *mut u64, cancellable: *mut gio::GCancellable, error: *mut *mut glib::GError) -> gboolean;
-    pub fn ostree_repo_prune_static_deltas(self_: *mut OstreeRepo, commit: *const c_char, cancellable: *mut gio::GCancellable, error: *mut *mut glib::GError) -> gboolean;
-    pub fn ostree_repo_pull(self_: *mut OstreeRepo, remote_name: *const c_char, refs_to_fetch: *mut *mut c_char, flags: OstreeRepoPullFlags, progress: *mut OstreeAsyncProgress, cancellable: *mut gio::GCancellable, error: *mut *mut glib::GError) -> gboolean;
+    #[cfg_attr(feature = "dox", doc(cfg(feature = "v2017_1")))]
+    pub fn ostree_repo_prune_from_reachable(
+        self_: *mut OstreeRepo,
+        options: *mut OstreeRepoPruneOptions,
+        out_objects_total: *mut c_int,
+        out_objects_pruned: *mut c_int,
+        out_pruned_object_size_total: *mut u64,
+        cancellable: *mut gio::GCancellable,
+        error: *mut *mut glib::GError,
+    ) -> gboolean;
+    pub fn ostree_repo_prune_static_deltas(
+        self_: *mut OstreeRepo,
+        commit: *const c_char,
+        cancellable: *mut gio::GCancellable,
+        error: *mut *mut glib::GError,
+    ) -> gboolean;
+    pub fn ostree_repo_pull(
+        self_: *mut OstreeRepo,
+        remote_name: *const c_char,
+        refs_to_fetch: *mut *mut c_char,
+        flags: OstreeRepoPullFlags,
+        progress: *mut OstreeAsyncProgress,
+        cancellable: *mut gio::GCancellable,
+        error: *mut *mut glib::GError,
+    ) -> gboolean;
     #[cfg(any(feature = "v2018_6", feature = "dox"))]
-    pub fn ostree_repo_pull_from_remotes_async(self_: *mut OstreeRepo, results: *const *const OstreeRepoFinderResult, options: *mut glib::GVariant, progress: *mut OstreeAsyncProgress, cancellable: *mut gio::GCancellable, callback: gio::GAsyncReadyCallback, user_data: gpointer);
+    #[cfg_attr(feature = "dox", doc(cfg(feature = "v2018_6")))]
+    pub fn ostree_repo_pull_from_remotes_async(
+        self_: *mut OstreeRepo,
+        results: *const *const OstreeRepoFinderResult,
+        options: *mut glib::GVariant,
+        progress: *mut OstreeAsyncProgress,
+        cancellable: *mut gio::GCancellable,
+        callback: gio::GAsyncReadyCallback,
+        user_data: gpointer,
+    );
     #[cfg(any(feature = "v2018_6", feature = "dox"))]
-    pub fn ostree_repo_pull_from_remotes_finish(self_: *mut OstreeRepo, result: *mut gio::GAsyncResult, error: *mut *mut glib::GError) -> gboolean;
-    pub fn ostree_repo_pull_one_dir(self_: *mut OstreeRepo, remote_name: *const c_char, dir_to_pull: *const c_char, refs_to_fetch: *mut *mut c_char, flags: OstreeRepoPullFlags, progress: *mut OstreeAsyncProgress, cancellable: *mut gio::GCancellable, error: *mut *mut glib::GError) -> gboolean;
-    pub fn ostree_repo_pull_with_options(self_: *mut OstreeRepo, remote_name_or_baseurl: *const c_char, options: *mut glib::GVariant, progress: *mut OstreeAsyncProgress, cancellable: *mut gio::GCancellable, error: *mut *mut glib::GError) -> gboolean;
-    pub fn ostree_repo_query_object_storage_size(self_: *mut OstreeRepo, objtype: OstreeObjectType, sha256: *const c_char, out_size: *mut u64, cancellable: *mut gio::GCancellable, error: *mut *mut glib::GError) -> gboolean;
-    pub fn ostree_repo_read_commit(self_: *mut OstreeRepo, ref_: *const c_char, out_root: *mut *mut gio::GFile, out_commit: *mut *mut c_char, cancellable: *mut gio::GCancellable, error: *mut *mut glib::GError) -> gboolean;
-    pub fn ostree_repo_read_commit_detached_metadata(self_: *mut OstreeRepo, checksum: *const c_char, out_metadata: *mut *mut glib::GVariant, cancellable: *mut gio::GCancellable, error: *mut *mut glib::GError) -> gboolean;
-    pub fn ostree_repo_regenerate_summary(self_: *mut OstreeRepo, additional_metadata: *mut glib::GVariant, cancellable: *mut gio::GCancellable, error: *mut *mut glib::GError) -> gboolean;
+    #[cfg_attr(feature = "dox", doc(cfg(feature = "v2018_6")))]
+    pub fn ostree_repo_pull_from_remotes_finish(
+        self_: *mut OstreeRepo,
+        result: *mut gio::GAsyncResult,
+        error: *mut *mut glib::GError,
+    ) -> gboolean;
+    pub fn ostree_repo_pull_one_dir(
+        self_: *mut OstreeRepo,
+        remote_name: *const c_char,
+        dir_to_pull: *const c_char,
+        refs_to_fetch: *mut *mut c_char,
+        flags: OstreeRepoPullFlags,
+        progress: *mut OstreeAsyncProgress,
+        cancellable: *mut gio::GCancellable,
+        error: *mut *mut glib::GError,
+    ) -> gboolean;
+    pub fn ostree_repo_pull_with_options(
+        self_: *mut OstreeRepo,
+        remote_name_or_baseurl: *const c_char,
+        options: *mut glib::GVariant,
+        progress: *mut OstreeAsyncProgress,
+        cancellable: *mut gio::GCancellable,
+        error: *mut *mut glib::GError,
+    ) -> gboolean;
+    pub fn ostree_repo_query_object_storage_size(
+        self_: *mut OstreeRepo,
+        objtype: OstreeObjectType,
+        sha256: *const c_char,
+        out_size: *mut u64,
+        cancellable: *mut gio::GCancellable,
+        error: *mut *mut glib::GError,
+    ) -> gboolean;
+    pub fn ostree_repo_read_commit(
+        self_: *mut OstreeRepo,
+        ref_: *const c_char,
+        out_root: *mut *mut gio::GFile,
+        out_commit: *mut *mut c_char,
+        cancellable: *mut gio::GCancellable,
+        error: *mut *mut glib::GError,
+    ) -> gboolean;
+    pub fn ostree_repo_read_commit_detached_metadata(
+        self_: *mut OstreeRepo,
+        checksum: *const c_char,
+        out_metadata: *mut *mut glib::GVariant,
+        cancellable: *mut gio::GCancellable,
+        error: *mut *mut glib::GError,
+    ) -> gboolean;
+    pub fn ostree_repo_regenerate_summary(
+        self_: *mut OstreeRepo,
+        additional_metadata: *mut glib::GVariant,
+        cancellable: *mut gio::GCancellable,
+        error: *mut *mut glib::GError,
+    ) -> gboolean;
     #[cfg(any(feature = "v2017_2", feature = "dox"))]
-    pub fn ostree_repo_reload_config(self_: *mut OstreeRepo, cancellable: *mut gio::GCancellable, error: *mut *mut glib::GError) -> gboolean;
-    pub fn ostree_repo_remote_add(self_: *mut OstreeRepo, name: *const c_char, url: *const c_char, options: *mut glib::GVariant, cancellable: *mut gio::GCancellable, error: *mut *mut glib::GError) -> gboolean;
-    pub fn ostree_repo_remote_change(self_: *mut OstreeRepo, sysroot: *mut gio::GFile, changeop: OstreeRepoRemoteChange, name: *const c_char, url: *const c_char, options: *mut glib::GVariant, cancellable: *mut gio::GCancellable, error: *mut *mut glib::GError) -> gboolean;
-    pub fn ostree_repo_remote_delete(self_: *mut OstreeRepo, name: *const c_char, cancellable: *mut gio::GCancellable, error: *mut *mut glib::GError) -> gboolean;
-    pub fn ostree_repo_remote_fetch_summary(self_: *mut OstreeRepo, name: *const c_char, out_summary: *mut *mut glib::GBytes, out_signatures: *mut *mut glib::GBytes, cancellable: *mut gio::GCancellable, error: *mut *mut glib::GError) -> gboolean;
+    #[cfg_attr(feature = "dox", doc(cfg(feature = "v2017_2")))]
+    pub fn ostree_repo_reload_config(
+        self_: *mut OstreeRepo,
+        cancellable: *mut gio::GCancellable,
+        error: *mut *mut glib::GError,
+    ) -> gboolean;
+    pub fn ostree_repo_remote_add(
+        self_: *mut OstreeRepo,
+        name: *const c_char,
+        url: *const c_char,
+        options: *mut glib::GVariant,
+        cancellable: *mut gio::GCancellable,
+        error: *mut *mut glib::GError,
+    ) -> gboolean;
+    pub fn ostree_repo_remote_change(
+        self_: *mut OstreeRepo,
+        sysroot: *mut gio::GFile,
+        changeop: OstreeRepoRemoteChange,
+        name: *const c_char,
+        url: *const c_char,
+        options: *mut glib::GVariant,
+        cancellable: *mut gio::GCancellable,
+        error: *mut *mut glib::GError,
+    ) -> gboolean;
+    pub fn ostree_repo_remote_delete(
+        self_: *mut OstreeRepo,
+        name: *const c_char,
+        cancellable: *mut gio::GCancellable,
+        error: *mut *mut glib::GError,
+    ) -> gboolean;
+    pub fn ostree_repo_remote_fetch_summary(
+        self_: *mut OstreeRepo,
+        name: *const c_char,
+        out_summary: *mut *mut glib::GBytes,
+        out_signatures: *mut *mut glib::GBytes,
+        cancellable: *mut gio::GCancellable,
+        error: *mut *mut glib::GError,
+    ) -> gboolean;
     #[cfg(any(feature = "v2016_6", feature = "dox"))]
-    pub fn ostree_repo_remote_fetch_summary_with_options(self_: *mut OstreeRepo, name: *const c_char, options: *mut glib::GVariant, out_summary: *mut *mut glib::GBytes, out_signatures: *mut *mut glib::GBytes, cancellable: *mut gio::GCancellable, error: *mut *mut glib::GError) -> gboolean;
-    pub fn ostree_repo_remote_get_gpg_verify(self_: *mut OstreeRepo, name: *const c_char, out_gpg_verify: *mut gboolean, error: *mut *mut glib::GError) -> gboolean;
-    pub fn ostree_repo_remote_get_gpg_verify_summary(self_: *mut OstreeRepo, name: *const c_char, out_gpg_verify_summary: *mut gboolean, error: *mut *mut glib::GError) -> gboolean;
-    pub fn ostree_repo_remote_get_url(self_: *mut OstreeRepo, name: *const c_char, out_url: *mut *mut c_char, error: *mut *mut glib::GError) -> gboolean;
-    pub fn ostree_repo_remote_gpg_import(self_: *mut OstreeRepo, name: *const c_char, source_stream: *mut gio::GInputStream, key_ids: *const *const c_char, out_imported: *mut c_uint, cancellable: *mut gio::GCancellable, error: *mut *mut glib::GError) -> gboolean;
-    pub fn ostree_repo_remote_list(self_: *mut OstreeRepo, out_n_remotes: *mut c_uint) -> *mut *mut c_char;
+    #[cfg_attr(feature = "dox", doc(cfg(feature = "v2016_6")))]
+    pub fn ostree_repo_remote_fetch_summary_with_options(
+        self_: *mut OstreeRepo,
+        name: *const c_char,
+        options: *mut glib::GVariant,
+        out_summary: *mut *mut glib::GBytes,
+        out_signatures: *mut *mut glib::GBytes,
+        cancellable: *mut gio::GCancellable,
+        error: *mut *mut glib::GError,
+    ) -> gboolean;
+    pub fn ostree_repo_remote_get_gpg_verify(
+        self_: *mut OstreeRepo,
+        name: *const c_char,
+        out_gpg_verify: *mut gboolean,
+        error: *mut *mut glib::GError,
+    ) -> gboolean;
+    pub fn ostree_repo_remote_get_gpg_verify_summary(
+        self_: *mut OstreeRepo,
+        name: *const c_char,
+        out_gpg_verify_summary: *mut gboolean,
+        error: *mut *mut glib::GError,
+    ) -> gboolean;
+    pub fn ostree_repo_remote_get_url(
+        self_: *mut OstreeRepo,
+        name: *const c_char,
+        out_url: *mut *mut c_char,
+        error: *mut *mut glib::GError,
+    ) -> gboolean;
+    pub fn ostree_repo_remote_gpg_import(
+        self_: *mut OstreeRepo,
+        name: *const c_char,
+        source_stream: *mut gio::GInputStream,
+        key_ids: *const *const c_char,
+        out_imported: *mut c_uint,
+        cancellable: *mut gio::GCancellable,
+        error: *mut *mut glib::GError,
+    ) -> gboolean;
+    pub fn ostree_repo_remote_list(
+        self_: *mut OstreeRepo,
+        out_n_remotes: *mut c_uint,
+    ) -> *mut *mut c_char;
     #[cfg(any(feature = "v2018_6", feature = "dox"))]
-    pub fn ostree_repo_remote_list_collection_refs(self_: *mut OstreeRepo, remote_name: *const c_char, out_all_refs: *mut *mut glib::GHashTable, cancellable: *mut gio::GCancellable, error: *mut *mut glib::GError) -> gboolean;
-    pub fn ostree_repo_remote_list_refs(self_: *mut OstreeRepo, remote_name: *const c_char, out_all_refs: *mut *mut glib::GHashTable, cancellable: *mut gio::GCancellable, error: *mut *mut glib::GError) -> gboolean;
+    #[cfg_attr(feature = "dox", doc(cfg(feature = "v2018_6")))]
+    pub fn ostree_repo_remote_list_collection_refs(
+        self_: *mut OstreeRepo,
+        remote_name: *const c_char,
+        out_all_refs: *mut *mut glib::GHashTable,
+        cancellable: *mut gio::GCancellable,
+        error: *mut *mut glib::GError,
+    ) -> gboolean;
+    pub fn ostree_repo_remote_list_refs(
+        self_: *mut OstreeRepo,
+        remote_name: *const c_char,
+        out_all_refs: *mut *mut glib::GHashTable,
+        cancellable: *mut gio::GCancellable,
+        error: *mut *mut glib::GError,
+    ) -> gboolean;
     #[cfg(any(feature = "v2018_6", feature = "dox"))]
-    pub fn ostree_repo_resolve_collection_ref(self_: *mut OstreeRepo, ref_: *const OstreeCollectionRef, allow_noent: gboolean, flags: OstreeRepoResolveRevExtFlags, out_rev: *mut *mut c_char, cancellable: *mut gio::GCancellable, error: *mut *mut glib::GError) -> gboolean;
+    #[cfg_attr(feature = "dox", doc(cfg(feature = "v2018_6")))]
+    pub fn ostree_repo_resolve_collection_ref(
+        self_: *mut OstreeRepo,
+        ref_: *const OstreeCollectionRef,
+        allow_noent: gboolean,
+        flags: OstreeRepoResolveRevExtFlags,
+        out_rev: *mut *mut c_char,
+        cancellable: *mut gio::GCancellable,
+        error: *mut *mut glib::GError,
+    ) -> gboolean;
     #[cfg(any(feature = "v2018_6", feature = "dox"))]
-    pub fn ostree_repo_resolve_keyring_for_collection(self_: *mut OstreeRepo, collection_id: *const c_char, cancellable: *mut gio::GCancellable, error: *mut *mut glib::GError) -> *mut OstreeRemote;
-    pub fn ostree_repo_resolve_rev(self_: *mut OstreeRepo, refspec: *const c_char, allow_noent: gboolean, out_rev: *mut *mut c_char, error: *mut *mut glib::GError) -> gboolean;
+    #[cfg_attr(feature = "dox", doc(cfg(feature = "v2018_6")))]
+    pub fn ostree_repo_resolve_keyring_for_collection(
+        self_: *mut OstreeRepo,
+        collection_id: *const c_char,
+        cancellable: *mut gio::GCancellable,
+        error: *mut *mut glib::GError,
+    ) -> *mut OstreeRemote;
+    pub fn ostree_repo_resolve_rev(
+        self_: *mut OstreeRepo,
+        refspec: *const c_char,
+        allow_noent: gboolean,
+        out_rev: *mut *mut c_char,
+        error: *mut *mut glib::GError,
+    ) -> gboolean;
     #[cfg(any(feature = "v2016_7", feature = "dox"))]
-    pub fn ostree_repo_resolve_rev_ext(self_: *mut OstreeRepo, refspec: *const c_char, allow_noent: gboolean, flags: OstreeRepoResolveRevExtFlags, out_rev: *mut *mut c_char, error: *mut *mut glib::GError) -> gboolean;
-    pub fn ostree_repo_scan_hardlinks(self_: *mut OstreeRepo, cancellable: *mut gio::GCancellable, error: *mut *mut glib::GError) -> gboolean;
+    #[cfg_attr(feature = "dox", doc(cfg(feature = "v2016_7")))]
+    pub fn ostree_repo_resolve_rev_ext(
+        self_: *mut OstreeRepo,
+        refspec: *const c_char,
+        allow_noent: gboolean,
+        flags: OstreeRepoResolveRevExtFlags,
+        out_rev: *mut *mut c_char,
+        error: *mut *mut glib::GError,
+    ) -> gboolean;
+    pub fn ostree_repo_scan_hardlinks(
+        self_: *mut OstreeRepo,
+        cancellable: *mut gio::GCancellable,
+        error: *mut *mut glib::GError,
+    ) -> gboolean;
     #[cfg(any(feature = "v2017_10", feature = "dox"))]
-    pub fn ostree_repo_set_alias_ref_immediate(self_: *mut OstreeRepo, remote: *const c_char, ref_: *const c_char, target: *const c_char, cancellable: *mut gio::GCancellable, error: *mut *mut glib::GError) -> gboolean;
+    #[cfg_attr(feature = "dox", doc(cfg(feature = "v2017_10")))]
+    pub fn ostree_repo_set_alias_ref_immediate(
+        self_: *mut OstreeRepo,
+        remote: *const c_char,
+        ref_: *const c_char,
+        target: *const c_char,
+        cancellable: *mut gio::GCancellable,
+        error: *mut *mut glib::GError,
+    ) -> gboolean;
     #[cfg(any(feature = "v2016_5", feature = "dox"))]
-    pub fn ostree_repo_set_cache_dir(self_: *mut OstreeRepo, dfd: c_int, path: *const c_char, cancellable: *mut gio::GCancellable, error: *mut *mut glib::GError) -> gboolean;
+    #[cfg_attr(feature = "dox", doc(cfg(feature = "v2016_5")))]
+    pub fn ostree_repo_set_cache_dir(
+        self_: *mut OstreeRepo,
+        dfd: c_int,
+        path: *const c_char,
+        cancellable: *mut gio::GCancellable,
+        error: *mut *mut glib::GError,
+    ) -> gboolean;
     #[cfg(any(feature = "v2018_6", feature = "dox"))]
-    pub fn ostree_repo_set_collection_id(self_: *mut OstreeRepo, collection_id: *const c_char, error: *mut *mut glib::GError) -> gboolean;
+    #[cfg_attr(feature = "dox", doc(cfg(feature = "v2018_6")))]
+    pub fn ostree_repo_set_collection_id(
+        self_: *mut OstreeRepo,
+        collection_id: *const c_char,
+        error: *mut *mut glib::GError,
+    ) -> gboolean;
     #[cfg(any(feature = "v2018_6", feature = "dox"))]
-    pub fn ostree_repo_set_collection_ref_immediate(self_: *mut OstreeRepo, ref_: *const OstreeCollectionRef, checksum: *const c_char, cancellable: *mut gio::GCancellable, error: *mut *mut glib::GError) -> gboolean;
+    #[cfg_attr(feature = "dox", doc(cfg(feature = "v2018_6")))]
+    pub fn ostree_repo_set_collection_ref_immediate(
+        self_: *mut OstreeRepo,
+        ref_: *const OstreeCollectionRef,
+        checksum: *const c_char,
+        cancellable: *mut gio::GCancellable,
+        error: *mut *mut glib::GError,
+    ) -> gboolean;
     pub fn ostree_repo_set_disable_fsync(self_: *mut OstreeRepo, disable_fsync: gboolean);
-    pub fn ostree_repo_set_ref_immediate(self_: *mut OstreeRepo, remote: *const c_char, ref_: *const c_char, checksum: *const c_char, cancellable: *mut gio::GCancellable, error: *mut *mut glib::GError) -> gboolean;
-    pub fn ostree_repo_sign_commit(self_: *mut OstreeRepo, commit_checksum: *const c_char, key_id: *const c_char, homedir: *const c_char, cancellable: *mut gio::GCancellable, error: *mut *mut glib::GError) -> gboolean;
-    pub fn ostree_repo_sign_delta(self_: *mut OstreeRepo, from_commit: *const c_char, to_commit: *const c_char, key_id: *const c_char, homedir: *const c_char, cancellable: *mut gio::GCancellable, error: *mut *mut glib::GError) -> gboolean;
-    pub fn ostree_repo_static_delta_execute_offline(self_: *mut OstreeRepo, dir_or_file: *mut gio::GFile, skip_validation: gboolean, cancellable: *mut gio::GCancellable, error: *mut *mut glib::GError) -> gboolean;
+    pub fn ostree_repo_set_ref_immediate(
+        self_: *mut OstreeRepo,
+        remote: *const c_char,
+        ref_: *const c_char,
+        checksum: *const c_char,
+        cancellable: *mut gio::GCancellable,
+        error: *mut *mut glib::GError,
+    ) -> gboolean;
+    pub fn ostree_repo_sign_commit(
+        self_: *mut OstreeRepo,
+        commit_checksum: *const c_char,
+        key_id: *const c_char,
+        homedir: *const c_char,
+        cancellable: *mut gio::GCancellable,
+        error: *mut *mut glib::GError,
+    ) -> gboolean;
+    pub fn ostree_repo_sign_delta(
+        self_: *mut OstreeRepo,
+        from_commit: *const c_char,
+        to_commit: *const c_char,
+        key_id: *const c_char,
+        homedir: *const c_char,
+        cancellable: *mut gio::GCancellable,
+        error: *mut *mut glib::GError,
+    ) -> gboolean;
+    pub fn ostree_repo_static_delta_execute_offline(
+        self_: *mut OstreeRepo,
+        dir_or_file: *mut gio::GFile,
+        skip_validation: gboolean,
+        cancellable: *mut gio::GCancellable,
+        error: *mut *mut glib::GError,
+    ) -> gboolean;
     #[cfg(any(feature = "v2020_7", feature = "dox"))]
-    pub fn ostree_repo_static_delta_execute_offline_with_signature(self_: *mut OstreeRepo, dir_or_file: *mut gio::GFile, sign: *mut OstreeSign, skip_validation: gboolean, cancellable: *mut gio::GCancellable, error: *mut *mut glib::GError) -> gboolean;
-    pub fn ostree_repo_static_delta_generate(self_: *mut OstreeRepo, opt: OstreeStaticDeltaGenerateOpt, from: *const c_char, to: *const c_char, metadata: *mut glib::GVariant, params: *mut glib::GVariant, cancellable: *mut gio::GCancellable, error: *mut *mut glib::GError) -> gboolean;
+    #[cfg_attr(feature = "dox", doc(cfg(feature = "v2020_7")))]
+    pub fn ostree_repo_static_delta_execute_offline_with_signature(
+        self_: *mut OstreeRepo,
+        dir_or_file: *mut gio::GFile,
+        sign: *mut OstreeSign,
+        skip_validation: gboolean,
+        cancellable: *mut gio::GCancellable,
+        error: *mut *mut glib::GError,
+    ) -> gboolean;
+    pub fn ostree_repo_static_delta_generate(
+        self_: *mut OstreeRepo,
+        opt: OstreeStaticDeltaGenerateOpt,
+        from: *const c_char,
+        to: *const c_char,
+        metadata: *mut glib::GVariant,
+        params: *mut glib::GVariant,
+        cancellable: *mut gio::GCancellable,
+        error: *mut *mut glib::GError,
+    ) -> gboolean;
     #[cfg(any(feature = "v2020_8", feature = "dox"))]
-    pub fn ostree_repo_static_delta_reindex(repo: *mut OstreeRepo, flags: OstreeStaticDeltaIndexFlags, opt_to_commit: *const c_char, cancellable: *mut gio::GCancellable, error: *mut *mut glib::GError) -> gboolean;
+    #[cfg_attr(feature = "dox", doc(cfg(feature = "v2020_8")))]
+    pub fn ostree_repo_static_delta_reindex(
+        repo: *mut OstreeRepo,
+        flags: OstreeStaticDeltaIndexFlags,
+        opt_to_commit: *const c_char,
+        cancellable: *mut gio::GCancellable,
+        error: *mut *mut glib::GError,
+    ) -> gboolean;
     #[cfg(any(feature = "v2020_7", feature = "dox"))]
-    pub fn ostree_repo_static_delta_verify_signature(self_: *mut OstreeRepo, delta_id: *const c_char, sign: *mut OstreeSign, out_success_message: *mut *mut c_char, error: *mut *mut glib::GError) -> gboolean;
+    #[cfg_attr(feature = "dox", doc(cfg(feature = "v2020_7")))]
+    pub fn ostree_repo_static_delta_verify_signature(
+        self_: *mut OstreeRepo,
+        delta_id: *const c_char,
+        sign: *mut OstreeSign,
+        out_success_message: *mut *mut c_char,
+        error: *mut *mut glib::GError,
+    ) -> gboolean;
     #[cfg(any(feature = "v2018_6", feature = "dox"))]
-    pub fn ostree_repo_transaction_set_collection_ref(self_: *mut OstreeRepo, ref_: *const OstreeCollectionRef, checksum: *const c_char);
-    pub fn ostree_repo_transaction_set_ref(self_: *mut OstreeRepo, remote: *const c_char, ref_: *const c_char, checksum: *const c_char);
-    pub fn ostree_repo_transaction_set_refspec(self_: *mut OstreeRepo, refspec: *const c_char, checksum: *const c_char);
-    pub fn ostree_repo_traverse_commit(repo: *mut OstreeRepo, commit_checksum: *const c_char, maxdepth: c_int, out_reachable: *mut *mut glib::GHashTable, cancellable: *mut gio::GCancellable, error: *mut *mut glib::GError) -> gboolean;
-    pub fn ostree_repo_traverse_commit_union(repo: *mut OstreeRepo, commit_checksum: *const c_char, maxdepth: c_int, inout_reachable: *mut glib::GHashTable, cancellable: *mut gio::GCancellable, error: *mut *mut glib::GError) -> gboolean;
+    #[cfg_attr(feature = "dox", doc(cfg(feature = "v2018_6")))]
+    pub fn ostree_repo_transaction_set_collection_ref(
+        self_: *mut OstreeRepo,
+        ref_: *const OstreeCollectionRef,
+        checksum: *const c_char,
+    );
+    pub fn ostree_repo_transaction_set_ref(
+        self_: *mut OstreeRepo,
+        remote: *const c_char,
+        ref_: *const c_char,
+        checksum: *const c_char,
+    );
+    pub fn ostree_repo_transaction_set_refspec(
+        self_: *mut OstreeRepo,
+        refspec: *const c_char,
+        checksum: *const c_char,
+    );
+    pub fn ostree_repo_traverse_commit(
+        repo: *mut OstreeRepo,
+        commit_checksum: *const c_char,
+        maxdepth: c_int,
+        out_reachable: *mut *mut glib::GHashTable,
+        cancellable: *mut gio::GCancellable,
+        error: *mut *mut glib::GError,
+    ) -> gboolean;
+    pub fn ostree_repo_traverse_commit_union(
+        repo: *mut OstreeRepo,
+        commit_checksum: *const c_char,
+        maxdepth: c_int,
+        inout_reachable: *mut glib::GHashTable,
+        cancellable: *mut gio::GCancellable,
+        error: *mut *mut glib::GError,
+    ) -> gboolean;
     #[cfg(any(feature = "v2018_5", feature = "dox"))]
-    pub fn ostree_repo_traverse_commit_union_with_parents(repo: *mut OstreeRepo, commit_checksum: *const c_char, maxdepth: c_int, inout_reachable: *mut glib::GHashTable, inout_parents: *mut glib::GHashTable, cancellable: *mut gio::GCancellable, error: *mut *mut glib::GError) -> gboolean;
+    #[cfg_attr(feature = "dox", doc(cfg(feature = "v2018_5")))]
+    pub fn ostree_repo_traverse_commit_union_with_parents(
+        repo: *mut OstreeRepo,
+        commit_checksum: *const c_char,
+        maxdepth: c_int,
+        inout_reachable: *mut glib::GHashTable,
+        inout_parents: *mut glib::GHashTable,
+        cancellable: *mut gio::GCancellable,
+        error: *mut *mut glib::GError,
+    ) -> gboolean;
     #[cfg(any(feature = "v2018_6", feature = "dox"))]
-    pub fn ostree_repo_traverse_reachable_refs(self_: *mut OstreeRepo, depth: c_uint, reachable: *mut glib::GHashTable, cancellable: *mut gio::GCancellable, error: *mut *mut glib::GError) -> gboolean;
-    pub fn ostree_repo_verify_commit(self_: *mut OstreeRepo, commit_checksum: *const c_char, keyringdir: *mut gio::GFile, extra_keyring: *mut gio::GFile, cancellable: *mut gio::GCancellable, error: *mut *mut glib::GError) -> gboolean;
-    pub fn ostree_repo_verify_commit_ext(self_: *mut OstreeRepo, commit_checksum: *const c_char, keyringdir: *mut gio::GFile, extra_keyring: *mut gio::GFile, cancellable: *mut gio::GCancellable, error: *mut *mut glib::GError) -> *mut OstreeGpgVerifyResult;
+    #[cfg_attr(feature = "dox", doc(cfg(feature = "v2018_6")))]
+    pub fn ostree_repo_traverse_reachable_refs(
+        self_: *mut OstreeRepo,
+        depth: c_uint,
+        reachable: *mut glib::GHashTable,
+        cancellable: *mut gio::GCancellable,
+        error: *mut *mut glib::GError,
+    ) -> gboolean;
+    pub fn ostree_repo_verify_commit(
+        self_: *mut OstreeRepo,
+        commit_checksum: *const c_char,
+        keyringdir: *mut gio::GFile,
+        extra_keyring: *mut gio::GFile,
+        cancellable: *mut gio::GCancellable,
+        error: *mut *mut glib::GError,
+    ) -> gboolean;
+    pub fn ostree_repo_verify_commit_ext(
+        self_: *mut OstreeRepo,
+        commit_checksum: *const c_char,
+        keyringdir: *mut gio::GFile,
+        extra_keyring: *mut gio::GFile,
+        cancellable: *mut gio::GCancellable,
+        error: *mut *mut glib::GError,
+    ) -> *mut OstreeGpgVerifyResult;
     #[cfg(any(feature = "v2016_14", feature = "dox"))]
-    pub fn ostree_repo_verify_commit_for_remote(self_: *mut OstreeRepo, commit_checksum: *const c_char, remote_name: *const c_char, cancellable: *mut gio::GCancellable, error: *mut *mut glib::GError) -> *mut OstreeGpgVerifyResult;
-    pub fn ostree_repo_verify_summary(self_: *mut OstreeRepo, remote_name: *const c_char, summary: *mut glib::GBytes, signatures: *mut glib::GBytes, cancellable: *mut gio::GCancellable, error: *mut *mut glib::GError) -> *mut OstreeGpgVerifyResult;
-    pub fn ostree_repo_write_archive_to_mtree(self_: *mut OstreeRepo, archive: *mut gio::GFile, mtree: *mut OstreeMutableTree, modifier: *mut OstreeRepoCommitModifier, autocreate_parents: gboolean, cancellable: *mut gio::GCancellable, error: *mut *mut glib::GError) -> gboolean;
-    pub fn ostree_repo_write_archive_to_mtree_from_fd(self_: *mut OstreeRepo, fd: c_int, mtree: *mut OstreeMutableTree, modifier: *mut OstreeRepoCommitModifier, autocreate_parents: gboolean, cancellable: *mut gio::GCancellable, error: *mut *mut glib::GError) -> gboolean;
-    pub fn ostree_repo_write_commit(self_: *mut OstreeRepo, parent: *const c_char, subject: *const c_char, body: *const c_char, metadata: *mut glib::GVariant, root: *mut OstreeRepoFile, out_commit: *mut *mut c_char, cancellable: *mut gio::GCancellable, error: *mut *mut glib::GError) -> gboolean;
-    pub fn ostree_repo_write_commit_detached_metadata(self_: *mut OstreeRepo, checksum: *const c_char, metadata: *mut glib::GVariant, cancellable: *mut gio::GCancellable, error: *mut *mut glib::GError) -> gboolean;
-    pub fn ostree_repo_write_commit_with_time(self_: *mut OstreeRepo, parent: *const c_char, subject: *const c_char, body: *const c_char, metadata: *mut glib::GVariant, root: *mut OstreeRepoFile, time: u64, out_commit: *mut *mut c_char, cancellable: *mut gio::GCancellable, error: *mut *mut glib::GError) -> gboolean;
-    pub fn ostree_repo_write_config(self_: *mut OstreeRepo, new_config: *mut glib::GKeyFile, error: *mut *mut glib::GError) -> gboolean;
-    pub fn ostree_repo_write_content(self_: *mut OstreeRepo, expected_checksum: *const c_char, object_input: *mut gio::GInputStream, length: u64, out_csum: *mut *mut [*mut u8; 32], cancellable: *mut gio::GCancellable, error: *mut *mut glib::GError) -> gboolean;
-    pub fn ostree_repo_write_content_async(self_: *mut OstreeRepo, expected_checksum: *const c_char, object: *mut gio::GInputStream, length: u64, cancellable: *mut gio::GCancellable, callback: gio::GAsyncReadyCallback, user_data: gpointer);
-    pub fn ostree_repo_write_content_finish(self_: *mut OstreeRepo, result: *mut gio::GAsyncResult, out_csum: *mut *mut u8, error: *mut *mut glib::GError) -> gboolean;
-    pub fn ostree_repo_write_content_trusted(self_: *mut OstreeRepo, checksum: *const c_char, object_input: *mut gio::GInputStream, length: u64, cancellable: *mut gio::GCancellable, error: *mut *mut glib::GError) -> gboolean;
-    pub fn ostree_repo_write_dfd_to_mtree(self_: *mut OstreeRepo, dfd: c_int, path: *const c_char, mtree: *mut OstreeMutableTree, modifier: *mut OstreeRepoCommitModifier, cancellable: *mut gio::GCancellable, error: *mut *mut glib::GError) -> gboolean;
-    pub fn ostree_repo_write_directory_to_mtree(self_: *mut OstreeRepo, dir: *mut gio::GFile, mtree: *mut OstreeMutableTree, modifier: *mut OstreeRepoCommitModifier, cancellable: *mut gio::GCancellable, error: *mut *mut glib::GError) -> gboolean;
-    pub fn ostree_repo_write_metadata(self_: *mut OstreeRepo, objtype: OstreeObjectType, expected_checksum: *const c_char, object: *mut glib::GVariant, out_csum: *mut *mut [*mut u8; 32], cancellable: *mut gio::GCancellable, error: *mut *mut glib::GError) -> gboolean;
-    pub fn ostree_repo_write_metadata_async(self_: *mut OstreeRepo, objtype: OstreeObjectType, expected_checksum: *const c_char, object: *mut glib::GVariant, cancellable: *mut gio::GCancellable, callback: gio::GAsyncReadyCallback, user_data: gpointer);
-    pub fn ostree_repo_write_metadata_finish(self_: *mut OstreeRepo, result: *mut gio::GAsyncResult, out_csum: *mut *mut [c_uchar; 32], error: *mut *mut glib::GError) -> gboolean;
-    pub fn ostree_repo_write_metadata_stream_trusted(self_: *mut OstreeRepo, objtype: OstreeObjectType, checksum: *const c_char, object_input: *mut gio::GInputStream, length: u64, cancellable: *mut gio::GCancellable, error: *mut *mut glib::GError) -> gboolean;
-    pub fn ostree_repo_write_metadata_trusted(self_: *mut OstreeRepo, objtype: OstreeObjectType, checksum: *const c_char, variant: *mut glib::GVariant, cancellable: *mut gio::GCancellable, error: *mut *mut glib::GError) -> gboolean;
-    pub fn ostree_repo_write_mtree(self_: *mut OstreeRepo, mtree: *mut OstreeMutableTree, out_file: *mut *mut gio::GFile, cancellable: *mut gio::GCancellable, error: *mut *mut glib::GError) -> gboolean;
+    #[cfg_attr(feature = "dox", doc(cfg(feature = "v2016_14")))]
+    pub fn ostree_repo_verify_commit_for_remote(
+        self_: *mut OstreeRepo,
+        commit_checksum: *const c_char,
+        remote_name: *const c_char,
+        cancellable: *mut gio::GCancellable,
+        error: *mut *mut glib::GError,
+    ) -> *mut OstreeGpgVerifyResult;
+    pub fn ostree_repo_verify_summary(
+        self_: *mut OstreeRepo,
+        remote_name: *const c_char,
+        summary: *mut glib::GBytes,
+        signatures: *mut glib::GBytes,
+        cancellable: *mut gio::GCancellable,
+        error: *mut *mut glib::GError,
+    ) -> *mut OstreeGpgVerifyResult;
+    pub fn ostree_repo_write_archive_to_mtree(
+        self_: *mut OstreeRepo,
+        archive: *mut gio::GFile,
+        mtree: *mut OstreeMutableTree,
+        modifier: *mut OstreeRepoCommitModifier,
+        autocreate_parents: gboolean,
+        cancellable: *mut gio::GCancellable,
+        error: *mut *mut glib::GError,
+    ) -> gboolean;
+    pub fn ostree_repo_write_archive_to_mtree_from_fd(
+        self_: *mut OstreeRepo,
+        fd: c_int,
+        mtree: *mut OstreeMutableTree,
+        modifier: *mut OstreeRepoCommitModifier,
+        autocreate_parents: gboolean,
+        cancellable: *mut gio::GCancellable,
+        error: *mut *mut glib::GError,
+    ) -> gboolean;
+    pub fn ostree_repo_write_commit(
+        self_: *mut OstreeRepo,
+        parent: *const c_char,
+        subject: *const c_char,
+        body: *const c_char,
+        metadata: *mut glib::GVariant,
+        root: *mut OstreeRepoFile,
+        out_commit: *mut *mut c_char,
+        cancellable: *mut gio::GCancellable,
+        error: *mut *mut glib::GError,
+    ) -> gboolean;
+    pub fn ostree_repo_write_commit_detached_metadata(
+        self_: *mut OstreeRepo,
+        checksum: *const c_char,
+        metadata: *mut glib::GVariant,
+        cancellable: *mut gio::GCancellable,
+        error: *mut *mut glib::GError,
+    ) -> gboolean;
+    pub fn ostree_repo_write_commit_with_time(
+        self_: *mut OstreeRepo,
+        parent: *const c_char,
+        subject: *const c_char,
+        body: *const c_char,
+        metadata: *mut glib::GVariant,
+        root: *mut OstreeRepoFile,
+        time: u64,
+        out_commit: *mut *mut c_char,
+        cancellable: *mut gio::GCancellable,
+        error: *mut *mut glib::GError,
+    ) -> gboolean;
+    pub fn ostree_repo_write_config(
+        self_: *mut OstreeRepo,
+        new_config: *mut glib::GKeyFile,
+        error: *mut *mut glib::GError,
+    ) -> gboolean;
+    pub fn ostree_repo_write_content(
+        self_: *mut OstreeRepo,
+        expected_checksum: *const c_char,
+        object_input: *mut gio::GInputStream,
+        length: u64,
+        out_csum: *mut *mut [*mut u8; 32],
+        cancellable: *mut gio::GCancellable,
+        error: *mut *mut glib::GError,
+    ) -> gboolean;
+    pub fn ostree_repo_write_content_async(
+        self_: *mut OstreeRepo,
+        expected_checksum: *const c_char,
+        object: *mut gio::GInputStream,
+        length: u64,
+        cancellable: *mut gio::GCancellable,
+        callback: gio::GAsyncReadyCallback,
+        user_data: gpointer,
+    );
+    pub fn ostree_repo_write_content_finish(
+        self_: *mut OstreeRepo,
+        result: *mut gio::GAsyncResult,
+        out_csum: *mut *mut u8,
+        error: *mut *mut glib::GError,
+    ) -> gboolean;
+    pub fn ostree_repo_write_content_trusted(
+        self_: *mut OstreeRepo,
+        checksum: *const c_char,
+        object_input: *mut gio::GInputStream,
+        length: u64,
+        cancellable: *mut gio::GCancellable,
+        error: *mut *mut glib::GError,
+    ) -> gboolean;
+    pub fn ostree_repo_write_dfd_to_mtree(
+        self_: *mut OstreeRepo,
+        dfd: c_int,
+        path: *const c_char,
+        mtree: *mut OstreeMutableTree,
+        modifier: *mut OstreeRepoCommitModifier,
+        cancellable: *mut gio::GCancellable,
+        error: *mut *mut glib::GError,
+    ) -> gboolean;
+    pub fn ostree_repo_write_directory_to_mtree(
+        self_: *mut OstreeRepo,
+        dir: *mut gio::GFile,
+        mtree: *mut OstreeMutableTree,
+        modifier: *mut OstreeRepoCommitModifier,
+        cancellable: *mut gio::GCancellable,
+        error: *mut *mut glib::GError,
+    ) -> gboolean;
+    pub fn ostree_repo_write_metadata(
+        self_: *mut OstreeRepo,
+        objtype: OstreeObjectType,
+        expected_checksum: *const c_char,
+        object: *mut glib::GVariant,
+        out_csum: *mut *mut [*mut u8; 32],
+        cancellable: *mut gio::GCancellable,
+        error: *mut *mut glib::GError,
+    ) -> gboolean;
+    pub fn ostree_repo_write_metadata_async(
+        self_: *mut OstreeRepo,
+        objtype: OstreeObjectType,
+        expected_checksum: *const c_char,
+        object: *mut glib::GVariant,
+        cancellable: *mut gio::GCancellable,
+        callback: gio::GAsyncReadyCallback,
+        user_data: gpointer,
+    );
+    pub fn ostree_repo_write_metadata_finish(
+        self_: *mut OstreeRepo,
+        result: *mut gio::GAsyncResult,
+        out_csum: *mut *mut [c_uchar; 32],
+        error: *mut *mut glib::GError,
+    ) -> gboolean;
+    pub fn ostree_repo_write_metadata_stream_trusted(
+        self_: *mut OstreeRepo,
+        objtype: OstreeObjectType,
+        checksum: *const c_char,
+        object_input: *mut gio::GInputStream,
+        length: u64,
+        cancellable: *mut gio::GCancellable,
+        error: *mut *mut glib::GError,
+    ) -> gboolean;
+    pub fn ostree_repo_write_metadata_trusted(
+        self_: *mut OstreeRepo,
+        objtype: OstreeObjectType,
+        checksum: *const c_char,
+        variant: *mut glib::GVariant,
+        cancellable: *mut gio::GCancellable,
+        error: *mut *mut glib::GError,
+    ) -> gboolean;
+    pub fn ostree_repo_write_mtree(
+        self_: *mut OstreeRepo,
+        mtree: *mut OstreeMutableTree,
+        out_file: *mut *mut gio::GFile,
+        cancellable: *mut gio::GCancellable,
+        error: *mut *mut glib::GError,
+    ) -> gboolean;
     #[cfg(any(feature = "v2021_2", feature = "dox"))]
-    pub fn ostree_repo_write_regfile(self_: *mut OstreeRepo, expected_checksum: *const c_char, uid: u32, gid: u32, mode: u32, content_len: u64, xattrs: *mut glib::GVariant, error: *mut *mut glib::GError) -> *mut OstreeContentWriter;
+    #[cfg_attr(feature = "dox", doc(cfg(feature = "v2021_2")))]
+    pub fn ostree_repo_write_regfile(
+        self_: *mut OstreeRepo,
+        expected_checksum: *const c_char,
+        uid: u32,
+        gid: u32,
+        mode: u32,
+        content_len: u64,
+        xattrs: *mut glib::GVariant,
+        error: *mut *mut glib::GError,
+    ) -> *mut OstreeContentWriter;
     #[cfg(any(feature = "v2021_2", feature = "dox"))]
-    pub fn ostree_repo_write_regfile_inline(self_: *mut OstreeRepo, expected_checksum: *const c_char, uid: u32, gid: u32, mode: u32, xattrs: *mut glib::GVariant, buf: *const u8, len: size_t, cancellable: *mut gio::GCancellable, error: *mut *mut glib::GError) -> *mut c_char;
+    #[cfg_attr(feature = "dox", doc(cfg(feature = "v2021_2")))]
+    pub fn ostree_repo_write_regfile_inline(
+        self_: *mut OstreeRepo,
+        expected_checksum: *const c_char,
+        uid: u32,
+        gid: u32,
+        mode: u32,
+        xattrs: *mut glib::GVariant,
+        buf: *const u8,
+        len: size_t,
+        cancellable: *mut gio::GCancellable,
+        error: *mut *mut glib::GError,
+    ) -> *mut c_char;
     #[cfg(any(feature = "v2021_2", feature = "dox"))]
-    pub fn ostree_repo_write_symlink(self_: *mut OstreeRepo, expected_checksum: *const c_char, uid: u32, gid: u32, xattrs: *mut glib::GVariant, symlink_target: *const c_char, cancellable: *mut gio::GCancellable, error: *mut *mut glib::GError) -> *mut c_char;
+    #[cfg_attr(feature = "dox", doc(cfg(feature = "v2021_2")))]
+    pub fn ostree_repo_write_symlink(
+        self_: *mut OstreeRepo,
+        expected_checksum: *const c_char,
+        uid: u32,
+        gid: u32,
+        xattrs: *mut glib::GVariant,
+        symlink_target: *const c_char,
+        cancellable: *mut gio::GCancellable,
+        error: *mut *mut glib::GError,
+    ) -> *mut c_char;
 
     //=========================================================================
     // OstreeRepoFile
     //=========================================================================
     pub fn ostree_repo_file_get_type() -> GType;
-    pub fn ostree_repo_file_ensure_resolved(self_: *mut OstreeRepoFile, error: *mut *mut glib::GError) -> gboolean;
+    pub fn ostree_repo_file_ensure_resolved(
+        self_: *mut OstreeRepoFile,
+        error: *mut *mut glib::GError,
+    ) -> gboolean;
     pub fn ostree_repo_file_get_checksum(self_: *mut OstreeRepoFile) -> *const c_char;
     pub fn ostree_repo_file_get_repo(self_: *mut OstreeRepoFile) -> *mut OstreeRepo;
     pub fn ostree_repo_file_get_root(self_: *mut OstreeRepoFile) -> *mut OstreeRepoFile;
-    pub fn ostree_repo_file_get_xattrs(self_: *mut OstreeRepoFile, out_xattrs: *mut *mut glib::GVariant, cancellable: *mut gio::GCancellable, error: *mut *mut glib::GError) -> gboolean;
-    pub fn ostree_repo_file_tree_find_child(self_: *mut OstreeRepoFile, name: *const c_char, is_dir: *mut gboolean, out_container: *mut *mut glib::GVariant) -> c_int;
+    pub fn ostree_repo_file_get_xattrs(
+        self_: *mut OstreeRepoFile,
+        out_xattrs: *mut *mut glib::GVariant,
+        cancellable: *mut gio::GCancellable,
+        error: *mut *mut glib::GError,
+    ) -> gboolean;
+    pub fn ostree_repo_file_tree_find_child(
+        self_: *mut OstreeRepoFile,
+        name: *const c_char,
+        is_dir: *mut gboolean,
+        out_container: *mut *mut glib::GVariant,
+    ) -> c_int;
     pub fn ostree_repo_file_tree_get_contents(self_: *mut OstreeRepoFile) -> *mut glib::GVariant;
-    pub fn ostree_repo_file_tree_get_contents_checksum(self_: *mut OstreeRepoFile) -> *const c_char;
+    pub fn ostree_repo_file_tree_get_contents_checksum(self_: *mut OstreeRepoFile)
+        -> *const c_char;
     pub fn ostree_repo_file_tree_get_metadata(self_: *mut OstreeRepoFile) -> *mut glib::GVariant;
-    pub fn ostree_repo_file_tree_get_metadata_checksum(self_: *mut OstreeRepoFile) -> *const c_char;
-    pub fn ostree_repo_file_tree_query_child(self_: *mut OstreeRepoFile, n: c_int, attributes: *const c_char, flags: gio::GFileQueryInfoFlags, out_info: *mut *mut gio::GFileInfo, cancellable: *mut gio::GCancellable, error: *mut *mut glib::GError) -> gboolean;
-    pub fn ostree_repo_file_tree_set_metadata(self_: *mut OstreeRepoFile, checksum: *const c_char, metadata: *mut glib::GVariant);
+    pub fn ostree_repo_file_tree_get_metadata_checksum(self_: *mut OstreeRepoFile)
+        -> *const c_char;
+    pub fn ostree_repo_file_tree_query_child(
+        self_: *mut OstreeRepoFile,
+        n: c_int,
+        attributes: *const c_char,
+        flags: gio::GFileQueryInfoFlags,
+        out_info: *mut *mut gio::GFileInfo,
+        cancellable: *mut gio::GCancellable,
+        error: *mut *mut glib::GError,
+    ) -> gboolean;
+    pub fn ostree_repo_file_tree_set_metadata(
+        self_: *mut OstreeRepoFile,
+        checksum: *const c_char,
+        metadata: *mut glib::GVariant,
+    );
 
     //=========================================================================
     // OstreeRepoFinderAvahi
     //=========================================================================
     pub fn ostree_repo_finder_avahi_get_type() -> GType;
     #[cfg(any(feature = "v2018_6", feature = "dox"))]
-    pub fn ostree_repo_finder_avahi_new(context: *mut glib::GMainContext) -> *mut OstreeRepoFinderAvahi;
+    #[cfg_attr(feature = "dox", doc(cfg(feature = "v2018_6")))]
+    pub fn ostree_repo_finder_avahi_new(
+        context: *mut glib::GMainContext,
+    ) -> *mut OstreeRepoFinderAvahi;
     #[cfg(any(feature = "v2018_6", feature = "dox"))]
-    pub fn ostree_repo_finder_avahi_start(self_: *mut OstreeRepoFinderAvahi, error: *mut *mut glib::GError);
+    #[cfg_attr(feature = "dox", doc(cfg(feature = "v2018_6")))]
+    pub fn ostree_repo_finder_avahi_start(
+        self_: *mut OstreeRepoFinderAvahi,
+        error: *mut *mut glib::GError,
+    );
     #[cfg(any(feature = "v2018_6", feature = "dox"))]
+    #[cfg_attr(feature = "dox", doc(cfg(feature = "v2018_6")))]
     pub fn ostree_repo_finder_avahi_stop(self_: *mut OstreeRepoFinderAvahi);
 
     //=========================================================================
@@ -1515,6 +2821,7 @@ extern "C" {
     //=========================================================================
     pub fn ostree_repo_finder_config_get_type() -> GType;
     #[cfg(any(feature = "v2018_6", feature = "dox"))]
+    #[cfg_attr(feature = "dox", doc(cfg(feature = "v2018_6")))]
     pub fn ostree_repo_finder_config_new() -> *mut OstreeRepoFinderConfig;
 
     //=========================================================================
@@ -1522,32 +2829,71 @@ extern "C" {
     //=========================================================================
     pub fn ostree_repo_finder_mount_get_type() -> GType;
     #[cfg(any(feature = "v2018_6", feature = "dox"))]
-    pub fn ostree_repo_finder_mount_new(monitor: *mut gio::GVolumeMonitor) -> *mut OstreeRepoFinderMount;
+    #[cfg_attr(feature = "dox", doc(cfg(feature = "v2018_6")))]
+    pub fn ostree_repo_finder_mount_new(
+        monitor: *mut gio::GVolumeMonitor,
+    ) -> *mut OstreeRepoFinderMount;
 
     //=========================================================================
     // OstreeRepoFinderOverride
     //=========================================================================
     pub fn ostree_repo_finder_override_get_type() -> GType;
     #[cfg(any(feature = "v2018_6", feature = "dox"))]
+    #[cfg_attr(feature = "dox", doc(cfg(feature = "v2018_6")))]
     pub fn ostree_repo_finder_override_new() -> *mut OstreeRepoFinderOverride;
     #[cfg(any(feature = "v2018_6", feature = "dox"))]
-    pub fn ostree_repo_finder_override_add_uri(self_: *mut OstreeRepoFinderOverride, uri: *const c_char);
+    #[cfg_attr(feature = "dox", doc(cfg(feature = "v2018_6")))]
+    pub fn ostree_repo_finder_override_add_uri(
+        self_: *mut OstreeRepoFinderOverride,
+        uri: *const c_char,
+    );
 
     //=========================================================================
     // OstreeSePolicy
     //=========================================================================
     pub fn ostree_sepolicy_get_type() -> GType;
-    pub fn ostree_sepolicy_new(path: *mut gio::GFile, cancellable: *mut gio::GCancellable, error: *mut *mut glib::GError) -> *mut OstreeSePolicy;
+    pub fn ostree_sepolicy_new(
+        path: *mut gio::GFile,
+        cancellable: *mut gio::GCancellable,
+        error: *mut *mut glib::GError,
+    ) -> *mut OstreeSePolicy;
     #[cfg(any(feature = "v2017_4", feature = "dox"))]
-    pub fn ostree_sepolicy_new_at(rootfs_dfd: c_int, cancellable: *mut gio::GCancellable, error: *mut *mut glib::GError) -> *mut OstreeSePolicy;
+    #[cfg_attr(feature = "dox", doc(cfg(feature = "v2017_4")))]
+    pub fn ostree_sepolicy_new_at(
+        rootfs_dfd: c_int,
+        cancellable: *mut gio::GCancellable,
+        error: *mut *mut glib::GError,
+    ) -> *mut OstreeSePolicy;
     pub fn ostree_sepolicy_fscreatecon_cleanup(unused: *mut *mut c_void);
     #[cfg(any(feature = "v2016_5", feature = "dox"))]
+    #[cfg_attr(feature = "dox", doc(cfg(feature = "v2016_5")))]
     pub fn ostree_sepolicy_get_csum(self_: *mut OstreeSePolicy) -> *const c_char;
-    pub fn ostree_sepolicy_get_label(self_: *mut OstreeSePolicy, relpath: *const c_char, unix_mode: u32, out_label: *mut *mut c_char, cancellable: *mut gio::GCancellable, error: *mut *mut glib::GError) -> gboolean;
+    pub fn ostree_sepolicy_get_label(
+        self_: *mut OstreeSePolicy,
+        relpath: *const c_char,
+        unix_mode: u32,
+        out_label: *mut *mut c_char,
+        cancellable: *mut gio::GCancellable,
+        error: *mut *mut glib::GError,
+    ) -> gboolean;
     pub fn ostree_sepolicy_get_name(self_: *mut OstreeSePolicy) -> *const c_char;
     pub fn ostree_sepolicy_get_path(self_: *mut OstreeSePolicy) -> *mut gio::GFile;
-    pub fn ostree_sepolicy_restorecon(self_: *mut OstreeSePolicy, path: *const c_char, info: *mut gio::GFileInfo, target: *mut gio::GFile, flags: OstreeSePolicyRestoreconFlags, out_new_label: *mut *mut c_char, cancellable: *mut gio::GCancellable, error: *mut *mut glib::GError) -> gboolean;
-    pub fn ostree_sepolicy_setfscreatecon(self_: *mut OstreeSePolicy, path: *const c_char, mode: u32, error: *mut *mut glib::GError) -> gboolean;
+    pub fn ostree_sepolicy_restorecon(
+        self_: *mut OstreeSePolicy,
+        path: *const c_char,
+        info: *mut gio::GFileInfo,
+        target: *mut gio::GFile,
+        flags: OstreeSePolicyRestoreconFlags,
+        out_new_label: *mut *mut c_char,
+        cancellable: *mut gio::GCancellable,
+        error: *mut *mut glib::GError,
+    ) -> gboolean;
+    pub fn ostree_sepolicy_setfscreatecon(
+        self_: *mut OstreeSePolicy,
+        path: *const c_char,
+        mode: u32,
+        error: *mut *mut glib::GError,
+    ) -> gboolean;
 
     //=========================================================================
     // OstreeSysroot
@@ -1555,173 +2901,616 @@ extern "C" {
     pub fn ostree_sysroot_get_type() -> GType;
     pub fn ostree_sysroot_new(path: *mut gio::GFile) -> *mut OstreeSysroot;
     pub fn ostree_sysroot_new_default() -> *mut OstreeSysroot;
-    pub fn ostree_sysroot_get_deployment_origin_path(deployment_path: *mut gio::GFile) -> *mut gio::GFile;
-    pub fn ostree_sysroot_cleanup(self_: *mut OstreeSysroot, cancellable: *mut gio::GCancellable, error: *mut *mut glib::GError) -> gboolean;
+    pub fn ostree_sysroot_get_deployment_origin_path(
+        deployment_path: *mut gio::GFile,
+    ) -> *mut gio::GFile;
+    pub fn ostree_sysroot_cleanup(
+        self_: *mut OstreeSysroot,
+        cancellable: *mut gio::GCancellable,
+        error: *mut *mut glib::GError,
+    ) -> gboolean;
     #[cfg(any(feature = "v2018_6", feature = "dox"))]
-    pub fn ostree_sysroot_cleanup_prune_repo(sysroot: *mut OstreeSysroot, options: *mut OstreeRepoPruneOptions, out_objects_total: *mut c_int, out_objects_pruned: *mut c_int, out_pruned_object_size_total: *mut u64, cancellable: *mut gio::GCancellable, error: *mut *mut glib::GError) -> gboolean;
+    #[cfg_attr(feature = "dox", doc(cfg(feature = "v2018_6")))]
+    pub fn ostree_sysroot_cleanup_prune_repo(
+        sysroot: *mut OstreeSysroot,
+        options: *mut OstreeRepoPruneOptions,
+        out_objects_total: *mut c_int,
+        out_objects_pruned: *mut c_int,
+        out_pruned_object_size_total: *mut u64,
+        cancellable: *mut gio::GCancellable,
+        error: *mut *mut glib::GError,
+    ) -> gboolean;
     #[cfg(any(feature = "v2018_5", feature = "dox"))]
-    pub fn ostree_sysroot_deploy_tree(self_: *mut OstreeSysroot, osname: *const c_char, revision: *const c_char, origin: *mut glib::GKeyFile, provided_merge_deployment: *mut OstreeDeployment, override_kernel_argv: *mut *mut c_char, out_new_deployment: *mut *mut OstreeDeployment, cancellable: *mut gio::GCancellable, error: *mut *mut glib::GError) -> gboolean;
+    #[cfg_attr(feature = "dox", doc(cfg(feature = "v2018_5")))]
+    pub fn ostree_sysroot_deploy_tree(
+        self_: *mut OstreeSysroot,
+        osname: *const c_char,
+        revision: *const c_char,
+        origin: *mut glib::GKeyFile,
+        provided_merge_deployment: *mut OstreeDeployment,
+        override_kernel_argv: *mut *mut c_char,
+        out_new_deployment: *mut *mut OstreeDeployment,
+        cancellable: *mut gio::GCancellable,
+        error: *mut *mut glib::GError,
+    ) -> gboolean;
     #[cfg(any(feature = "v2020_7", feature = "dox"))]
-    pub fn ostree_sysroot_deploy_tree_with_options(self_: *mut OstreeSysroot, osname: *const c_char, revision: *const c_char, origin: *mut glib::GKeyFile, provided_merge_deployment: *mut OstreeDeployment, opts: *mut OstreeSysrootDeployTreeOpts, out_new_deployment: *mut *mut OstreeDeployment, cancellable: *mut gio::GCancellable, error: *mut *mut glib::GError) -> gboolean;
-    pub fn ostree_sysroot_deployment_set_kargs(self_: *mut OstreeSysroot, deployment: *mut OstreeDeployment, new_kargs: *mut *mut c_char, cancellable: *mut gio::GCancellable, error: *mut *mut glib::GError) -> gboolean;
-    pub fn ostree_sysroot_deployment_set_mutable(self_: *mut OstreeSysroot, deployment: *mut OstreeDeployment, is_mutable: gboolean, cancellable: *mut gio::GCancellable, error: *mut *mut glib::GError) -> gboolean;
+    #[cfg_attr(feature = "dox", doc(cfg(feature = "v2020_7")))]
+    pub fn ostree_sysroot_deploy_tree_with_options(
+        self_: *mut OstreeSysroot,
+        osname: *const c_char,
+        revision: *const c_char,
+        origin: *mut glib::GKeyFile,
+        provided_merge_deployment: *mut OstreeDeployment,
+        opts: *mut OstreeSysrootDeployTreeOpts,
+        out_new_deployment: *mut *mut OstreeDeployment,
+        cancellable: *mut gio::GCancellable,
+        error: *mut *mut glib::GError,
+    ) -> gboolean;
+    pub fn ostree_sysroot_deployment_set_kargs(
+        self_: *mut OstreeSysroot,
+        deployment: *mut OstreeDeployment,
+        new_kargs: *mut *mut c_char,
+        cancellable: *mut gio::GCancellable,
+        error: *mut *mut glib::GError,
+    ) -> gboolean;
+    pub fn ostree_sysroot_deployment_set_mutable(
+        self_: *mut OstreeSysroot,
+        deployment: *mut OstreeDeployment,
+        is_mutable: gboolean,
+        cancellable: *mut gio::GCancellable,
+        error: *mut *mut glib::GError,
+    ) -> gboolean;
     #[cfg(any(feature = "v2018_3", feature = "dox"))]
-    pub fn ostree_sysroot_deployment_set_pinned(self_: *mut OstreeSysroot, deployment: *mut OstreeDeployment, is_pinned: gboolean, error: *mut *mut glib::GError) -> gboolean;
+    #[cfg_attr(feature = "dox", doc(cfg(feature = "v2018_3")))]
+    pub fn ostree_sysroot_deployment_set_pinned(
+        self_: *mut OstreeSysroot,
+        deployment: *mut OstreeDeployment,
+        is_pinned: gboolean,
+        error: *mut *mut glib::GError,
+    ) -> gboolean;
     #[cfg(any(feature = "v2016_4", feature = "dox"))]
-    pub fn ostree_sysroot_deployment_unlock(self_: *mut OstreeSysroot, deployment: *mut OstreeDeployment, unlocked_state: OstreeDeploymentUnlockedState, cancellable: *mut gio::GCancellable, error: *mut *mut glib::GError) -> gboolean;
-    pub fn ostree_sysroot_ensure_initialized(self_: *mut OstreeSysroot, cancellable: *mut gio::GCancellable, error: *mut *mut glib::GError) -> gboolean;
-    pub fn ostree_sysroot_get_booted_deployment(self_: *mut OstreeSysroot) -> *mut OstreeDeployment;
+    #[cfg_attr(feature = "dox", doc(cfg(feature = "v2016_4")))]
+    pub fn ostree_sysroot_deployment_unlock(
+        self_: *mut OstreeSysroot,
+        deployment: *mut OstreeDeployment,
+        unlocked_state: OstreeDeploymentUnlockedState,
+        cancellable: *mut gio::GCancellable,
+        error: *mut *mut glib::GError,
+    ) -> gboolean;
+    pub fn ostree_sysroot_ensure_initialized(
+        self_: *mut OstreeSysroot,
+        cancellable: *mut gio::GCancellable,
+        error: *mut *mut glib::GError,
+    ) -> gboolean;
+    pub fn ostree_sysroot_get_booted_deployment(self_: *mut OstreeSysroot)
+        -> *mut OstreeDeployment;
     pub fn ostree_sysroot_get_bootversion(self_: *mut OstreeSysroot) -> c_int;
-    pub fn ostree_sysroot_get_deployment_directory(self_: *mut OstreeSysroot, deployment: *mut OstreeDeployment) -> *mut gio::GFile;
-    pub fn ostree_sysroot_get_deployment_dirpath(self_: *mut OstreeSysroot, deployment: *mut OstreeDeployment) -> *mut c_char;
+    pub fn ostree_sysroot_get_deployment_directory(
+        self_: *mut OstreeSysroot,
+        deployment: *mut OstreeDeployment,
+    ) -> *mut gio::GFile;
+    pub fn ostree_sysroot_get_deployment_dirpath(
+        self_: *mut OstreeSysroot,
+        deployment: *mut OstreeDeployment,
+    ) -> *mut c_char;
     pub fn ostree_sysroot_get_deployments(self_: *mut OstreeSysroot) -> *mut glib::GPtrArray;
     pub fn ostree_sysroot_get_fd(self_: *mut OstreeSysroot) -> c_int;
-    pub fn ostree_sysroot_get_merge_deployment(self_: *mut OstreeSysroot, osname: *const c_char) -> *mut OstreeDeployment;
+    pub fn ostree_sysroot_get_merge_deployment(
+        self_: *mut OstreeSysroot,
+        osname: *const c_char,
+    ) -> *mut OstreeDeployment;
     pub fn ostree_sysroot_get_path(self_: *mut OstreeSysroot) -> *mut gio::GFile;
-    pub fn ostree_sysroot_get_repo(self_: *mut OstreeSysroot, out_repo: *mut *mut OstreeRepo, cancellable: *mut gio::GCancellable, error: *mut *mut glib::GError) -> gboolean;
+    pub fn ostree_sysroot_get_repo(
+        self_: *mut OstreeSysroot,
+        out_repo: *mut *mut OstreeRepo,
+        cancellable: *mut gio::GCancellable,
+        error: *mut *mut glib::GError,
+    ) -> gboolean;
     #[cfg(any(feature = "v2018_5", feature = "dox"))]
-    pub fn ostree_sysroot_get_staged_deployment(self_: *mut OstreeSysroot) -> *mut OstreeDeployment;
+    #[cfg_attr(feature = "dox", doc(cfg(feature = "v2018_5")))]
+    pub fn ostree_sysroot_get_staged_deployment(self_: *mut OstreeSysroot)
+        -> *mut OstreeDeployment;
     pub fn ostree_sysroot_get_subbootversion(self_: *mut OstreeSysroot) -> c_int;
     #[cfg(any(feature = "v2016_4", feature = "dox"))]
-    pub fn ostree_sysroot_init_osname(self_: *mut OstreeSysroot, osname: *const c_char, cancellable: *mut gio::GCancellable, error: *mut *mut glib::GError) -> gboolean;
+    #[cfg_attr(feature = "dox", doc(cfg(feature = "v2016_4")))]
+    pub fn ostree_sysroot_init_osname(
+        self_: *mut OstreeSysroot,
+        osname: *const c_char,
+        cancellable: *mut gio::GCancellable,
+        error: *mut *mut glib::GError,
+    ) -> gboolean;
     #[cfg(any(feature = "v2020_1", feature = "dox"))]
-    pub fn ostree_sysroot_initialize(self_: *mut OstreeSysroot, error: *mut *mut glib::GError) -> gboolean;
+    #[cfg_attr(feature = "dox", doc(cfg(feature = "v2020_1")))]
+    pub fn ostree_sysroot_initialize(
+        self_: *mut OstreeSysroot,
+        error: *mut *mut glib::GError,
+    ) -> gboolean;
     #[cfg(any(feature = "v2020_1", feature = "dox"))]
+    #[cfg_attr(feature = "dox", doc(cfg(feature = "v2020_1")))]
     pub fn ostree_sysroot_is_booted(self_: *mut OstreeSysroot) -> gboolean;
-    pub fn ostree_sysroot_load(self_: *mut OstreeSysroot, cancellable: *mut gio::GCancellable, error: *mut *mut glib::GError) -> gboolean;
+    pub fn ostree_sysroot_load(
+        self_: *mut OstreeSysroot,
+        cancellable: *mut gio::GCancellable,
+        error: *mut *mut glib::GError,
+    ) -> gboolean;
     #[cfg(any(feature = "v2016_4", feature = "dox"))]
-    pub fn ostree_sysroot_load_if_changed(self_: *mut OstreeSysroot, out_changed: *mut gboolean, cancellable: *mut gio::GCancellable, error: *mut *mut glib::GError) -> gboolean;
-    pub fn ostree_sysroot_lock(self_: *mut OstreeSysroot, error: *mut *mut glib::GError) -> gboolean;
-    pub fn ostree_sysroot_lock_async(self_: *mut OstreeSysroot, cancellable: *mut gio::GCancellable, callback: gio::GAsyncReadyCallback, user_data: gpointer);
-    pub fn ostree_sysroot_lock_finish(self_: *mut OstreeSysroot, result: *mut gio::GAsyncResult, error: *mut *mut glib::GError) -> gboolean;
-    pub fn ostree_sysroot_origin_new_from_refspec(self_: *mut OstreeSysroot, refspec: *const c_char) -> *mut glib::GKeyFile;
-    pub fn ostree_sysroot_prepare_cleanup(self_: *mut OstreeSysroot, cancellable: *mut gio::GCancellable, error: *mut *mut glib::GError) -> gboolean;
+    #[cfg_attr(feature = "dox", doc(cfg(feature = "v2016_4")))]
+    pub fn ostree_sysroot_load_if_changed(
+        self_: *mut OstreeSysroot,
+        out_changed: *mut gboolean,
+        cancellable: *mut gio::GCancellable,
+        error: *mut *mut glib::GError,
+    ) -> gboolean;
+    pub fn ostree_sysroot_lock(
+        self_: *mut OstreeSysroot,
+        error: *mut *mut glib::GError,
+    ) -> gboolean;
+    pub fn ostree_sysroot_lock_async(
+        self_: *mut OstreeSysroot,
+        cancellable: *mut gio::GCancellable,
+        callback: gio::GAsyncReadyCallback,
+        user_data: gpointer,
+    );
+    pub fn ostree_sysroot_lock_finish(
+        self_: *mut OstreeSysroot,
+        result: *mut gio::GAsyncResult,
+        error: *mut *mut glib::GError,
+    ) -> gboolean;
+    pub fn ostree_sysroot_origin_new_from_refspec(
+        self_: *mut OstreeSysroot,
+        refspec: *const c_char,
+    ) -> *mut glib::GKeyFile;
+    pub fn ostree_sysroot_prepare_cleanup(
+        self_: *mut OstreeSysroot,
+        cancellable: *mut gio::GCancellable,
+        error: *mut *mut glib::GError,
+    ) -> gboolean;
     #[cfg(any(feature = "v2017_7", feature = "dox"))]
-    pub fn ostree_sysroot_query_deployments_for(self_: *mut OstreeSysroot, osname: *const c_char, out_pending: *mut *mut OstreeDeployment, out_rollback: *mut *mut OstreeDeployment);
+    #[cfg_attr(feature = "dox", doc(cfg(feature = "v2017_7")))]
+    pub fn ostree_sysroot_query_deployments_for(
+        self_: *mut OstreeSysroot,
+        osname: *const c_char,
+        out_pending: *mut *mut OstreeDeployment,
+        out_rollback: *mut *mut OstreeDeployment,
+    );
     #[cfg(any(feature = "v2017_7", feature = "dox"))]
+    #[cfg_attr(feature = "dox", doc(cfg(feature = "v2017_7")))]
     pub fn ostree_sysroot_repo(self_: *mut OstreeSysroot) -> *mut OstreeRepo;
     #[cfg(any(feature = "v2021_1", feature = "dox"))]
-    pub fn ostree_sysroot_require_booted_deployment(self_: *mut OstreeSysroot, error: *mut *mut glib::GError) -> *mut OstreeDeployment;
+    #[cfg_attr(feature = "dox", doc(cfg(feature = "v2021_1")))]
+    pub fn ostree_sysroot_require_booted_deployment(
+        self_: *mut OstreeSysroot,
+        error: *mut *mut glib::GError,
+    ) -> *mut OstreeDeployment;
     #[cfg(any(feature = "v2020_1", feature = "dox"))]
+    #[cfg_attr(feature = "dox", doc(cfg(feature = "v2020_1")))]
     pub fn ostree_sysroot_set_mount_namespace_in_use(self_: *mut OstreeSysroot);
-    pub fn ostree_sysroot_simple_write_deployment(sysroot: *mut OstreeSysroot, osname: *const c_char, new_deployment: *mut OstreeDeployment, merge_deployment: *mut OstreeDeployment, flags: OstreeSysrootSimpleWriteDeploymentFlags, cancellable: *mut gio::GCancellable, error: *mut *mut glib::GError) -> gboolean;
+    pub fn ostree_sysroot_simple_write_deployment(
+        sysroot: *mut OstreeSysroot,
+        osname: *const c_char,
+        new_deployment: *mut OstreeDeployment,
+        merge_deployment: *mut OstreeDeployment,
+        flags: OstreeSysrootSimpleWriteDeploymentFlags,
+        cancellable: *mut gio::GCancellable,
+        error: *mut *mut glib::GError,
+    ) -> gboolean;
     #[cfg(any(feature = "v2020_7", feature = "dox"))]
-    pub fn ostree_sysroot_stage_overlay_initrd(self_: *mut OstreeSysroot, fd: c_int, out_checksum: *mut *mut c_char, cancellable: *mut gio::GCancellable, error: *mut *mut glib::GError) -> gboolean;
+    #[cfg_attr(feature = "dox", doc(cfg(feature = "v2020_7")))]
+    pub fn ostree_sysroot_stage_overlay_initrd(
+        self_: *mut OstreeSysroot,
+        fd: c_int,
+        out_checksum: *mut *mut c_char,
+        cancellable: *mut gio::GCancellable,
+        error: *mut *mut glib::GError,
+    ) -> gboolean;
     #[cfg(any(feature = "v2018_5", feature = "dox"))]
-    pub fn ostree_sysroot_stage_tree(self_: *mut OstreeSysroot, osname: *const c_char, revision: *const c_char, origin: *mut glib::GKeyFile, merge_deployment: *mut OstreeDeployment, override_kernel_argv: *mut *mut c_char, out_new_deployment: *mut *mut OstreeDeployment, cancellable: *mut gio::GCancellable, error: *mut *mut glib::GError) -> gboolean;
+    #[cfg_attr(feature = "dox", doc(cfg(feature = "v2018_5")))]
+    pub fn ostree_sysroot_stage_tree(
+        self_: *mut OstreeSysroot,
+        osname: *const c_char,
+        revision: *const c_char,
+        origin: *mut glib::GKeyFile,
+        merge_deployment: *mut OstreeDeployment,
+        override_kernel_argv: *mut *mut c_char,
+        out_new_deployment: *mut *mut OstreeDeployment,
+        cancellable: *mut gio::GCancellable,
+        error: *mut *mut glib::GError,
+    ) -> gboolean;
     #[cfg(any(feature = "v2020_7", feature = "dox"))]
-    pub fn ostree_sysroot_stage_tree_with_options(self_: *mut OstreeSysroot, osname: *const c_char, revision: *const c_char, origin: *mut glib::GKeyFile, merge_deployment: *mut OstreeDeployment, opts: *mut OstreeSysrootDeployTreeOpts, out_new_deployment: *mut *mut OstreeDeployment, cancellable: *mut gio::GCancellable, error: *mut *mut glib::GError) -> gboolean;
-    pub fn ostree_sysroot_try_lock(self_: *mut OstreeSysroot, out_acquired: *mut gboolean, error: *mut *mut glib::GError) -> gboolean;
+    #[cfg_attr(feature = "dox", doc(cfg(feature = "v2020_7")))]
+    pub fn ostree_sysroot_stage_tree_with_options(
+        self_: *mut OstreeSysroot,
+        osname: *const c_char,
+        revision: *const c_char,
+        origin: *mut glib::GKeyFile,
+        merge_deployment: *mut OstreeDeployment,
+        opts: *mut OstreeSysrootDeployTreeOpts,
+        out_new_deployment: *mut *mut OstreeDeployment,
+        cancellable: *mut gio::GCancellable,
+        error: *mut *mut glib::GError,
+    ) -> gboolean;
+    pub fn ostree_sysroot_try_lock(
+        self_: *mut OstreeSysroot,
+        out_acquired: *mut gboolean,
+        error: *mut *mut glib::GError,
+    ) -> gboolean;
     pub fn ostree_sysroot_unload(self_: *mut OstreeSysroot);
     pub fn ostree_sysroot_unlock(self_: *mut OstreeSysroot);
-    pub fn ostree_sysroot_write_deployments(self_: *mut OstreeSysroot, new_deployments: *mut glib::GPtrArray, cancellable: *mut gio::GCancellable, error: *mut *mut glib::GError) -> gboolean;
+    pub fn ostree_sysroot_write_deployments(
+        self_: *mut OstreeSysroot,
+        new_deployments: *mut glib::GPtrArray,
+        cancellable: *mut gio::GCancellable,
+        error: *mut *mut glib::GError,
+    ) -> gboolean;
     #[cfg(any(feature = "v2017_4", feature = "dox"))]
-    pub fn ostree_sysroot_write_deployments_with_options(self_: *mut OstreeSysroot, new_deployments: *mut glib::GPtrArray, opts: *mut OstreeSysrootWriteDeploymentsOpts, cancellable: *mut gio::GCancellable, error: *mut *mut glib::GError) -> gboolean;
-    pub fn ostree_sysroot_write_origin_file(sysroot: *mut OstreeSysroot, deployment: *mut OstreeDeployment, new_origin: *mut glib::GKeyFile, cancellable: *mut gio::GCancellable, error: *mut *mut glib::GError) -> gboolean;
+    #[cfg_attr(feature = "dox", doc(cfg(feature = "v2017_4")))]
+    pub fn ostree_sysroot_write_deployments_with_options(
+        self_: *mut OstreeSysroot,
+        new_deployments: *mut glib::GPtrArray,
+        opts: *mut OstreeSysrootWriteDeploymentsOpts,
+        cancellable: *mut gio::GCancellable,
+        error: *mut *mut glib::GError,
+    ) -> gboolean;
+    pub fn ostree_sysroot_write_origin_file(
+        sysroot: *mut OstreeSysroot,
+        deployment: *mut OstreeDeployment,
+        new_origin: *mut glib::GKeyFile,
+        cancellable: *mut gio::GCancellable,
+        error: *mut *mut glib::GError,
+    ) -> gboolean;
 
     //=========================================================================
     // OstreeSysrootUpgrader
     //=========================================================================
     pub fn ostree_sysroot_upgrader_get_type() -> GType;
-    pub fn ostree_sysroot_upgrader_new(sysroot: *mut OstreeSysroot, cancellable: *mut gio::GCancellable, error: *mut *mut glib::GError) -> *mut OstreeSysrootUpgrader;
-    pub fn ostree_sysroot_upgrader_new_for_os(sysroot: *mut OstreeSysroot, osname: *const c_char, cancellable: *mut gio::GCancellable, error: *mut *mut glib::GError) -> *mut OstreeSysrootUpgrader;
-    pub fn ostree_sysroot_upgrader_new_for_os_with_flags(sysroot: *mut OstreeSysroot, osname: *const c_char, flags: OstreeSysrootUpgraderFlags, cancellable: *mut gio::GCancellable, error: *mut *mut glib::GError) -> *mut OstreeSysrootUpgrader;
-    pub fn ostree_sysroot_upgrader_check_timestamps(repo: *mut OstreeRepo, from_rev: *const c_char, to_rev: *const c_char, error: *mut *mut glib::GError) -> gboolean;
-    pub fn ostree_sysroot_upgrader_deploy(self_: *mut OstreeSysrootUpgrader, cancellable: *mut gio::GCancellable, error: *mut *mut glib::GError) -> gboolean;
-    pub fn ostree_sysroot_upgrader_dup_origin(self_: *mut OstreeSysrootUpgrader) -> *mut glib::GKeyFile;
-    pub fn ostree_sysroot_upgrader_get_origin(self_: *mut OstreeSysrootUpgrader) -> *mut glib::GKeyFile;
-    pub fn ostree_sysroot_upgrader_get_origin_description(self_: *mut OstreeSysrootUpgrader) -> *mut c_char;
-    pub fn ostree_sysroot_upgrader_pull(self_: *mut OstreeSysrootUpgrader, flags: OstreeRepoPullFlags, upgrader_flags: OstreeSysrootUpgraderPullFlags, progress: *mut OstreeAsyncProgress, out_changed: *mut gboolean, cancellable: *mut gio::GCancellable, error: *mut *mut glib::GError) -> gboolean;
-    pub fn ostree_sysroot_upgrader_pull_one_dir(self_: *mut OstreeSysrootUpgrader, dir_to_pull: *const c_char, flags: OstreeRepoPullFlags, upgrader_flags: OstreeSysrootUpgraderPullFlags, progress: *mut OstreeAsyncProgress, out_changed: *mut gboolean, cancellable: *mut gio::GCancellable, error: *mut *mut glib::GError) -> gboolean;
-    pub fn ostree_sysroot_upgrader_set_origin(self_: *mut OstreeSysrootUpgrader, origin: *mut glib::GKeyFile, cancellable: *mut gio::GCancellable, error: *mut *mut glib::GError) -> gboolean;
+    pub fn ostree_sysroot_upgrader_new(
+        sysroot: *mut OstreeSysroot,
+        cancellable: *mut gio::GCancellable,
+        error: *mut *mut glib::GError,
+    ) -> *mut OstreeSysrootUpgrader;
+    pub fn ostree_sysroot_upgrader_new_for_os(
+        sysroot: *mut OstreeSysroot,
+        osname: *const c_char,
+        cancellable: *mut gio::GCancellable,
+        error: *mut *mut glib::GError,
+    ) -> *mut OstreeSysrootUpgrader;
+    pub fn ostree_sysroot_upgrader_new_for_os_with_flags(
+        sysroot: *mut OstreeSysroot,
+        osname: *const c_char,
+        flags: OstreeSysrootUpgraderFlags,
+        cancellable: *mut gio::GCancellable,
+        error: *mut *mut glib::GError,
+    ) -> *mut OstreeSysrootUpgrader;
+    pub fn ostree_sysroot_upgrader_check_timestamps(
+        repo: *mut OstreeRepo,
+        from_rev: *const c_char,
+        to_rev: *const c_char,
+        error: *mut *mut glib::GError,
+    ) -> gboolean;
+    pub fn ostree_sysroot_upgrader_deploy(
+        self_: *mut OstreeSysrootUpgrader,
+        cancellable: *mut gio::GCancellable,
+        error: *mut *mut glib::GError,
+    ) -> gboolean;
+    pub fn ostree_sysroot_upgrader_dup_origin(
+        self_: *mut OstreeSysrootUpgrader,
+    ) -> *mut glib::GKeyFile;
+    pub fn ostree_sysroot_upgrader_get_origin(
+        self_: *mut OstreeSysrootUpgrader,
+    ) -> *mut glib::GKeyFile;
+    pub fn ostree_sysroot_upgrader_get_origin_description(
+        self_: *mut OstreeSysrootUpgrader,
+    ) -> *mut c_char;
+    pub fn ostree_sysroot_upgrader_pull(
+        self_: *mut OstreeSysrootUpgrader,
+        flags: OstreeRepoPullFlags,
+        upgrader_flags: OstreeSysrootUpgraderPullFlags,
+        progress: *mut OstreeAsyncProgress,
+        out_changed: *mut gboolean,
+        cancellable: *mut gio::GCancellable,
+        error: *mut *mut glib::GError,
+    ) -> gboolean;
+    pub fn ostree_sysroot_upgrader_pull_one_dir(
+        self_: *mut OstreeSysrootUpgrader,
+        dir_to_pull: *const c_char,
+        flags: OstreeRepoPullFlags,
+        upgrader_flags: OstreeSysrootUpgraderPullFlags,
+        progress: *mut OstreeAsyncProgress,
+        out_changed: *mut gboolean,
+        cancellable: *mut gio::GCancellable,
+        error: *mut *mut glib::GError,
+    ) -> gboolean;
+    pub fn ostree_sysroot_upgrader_set_origin(
+        self_: *mut OstreeSysrootUpgrader,
+        origin: *mut glib::GKeyFile,
+        cancellable: *mut gio::GCancellable,
+        error: *mut *mut glib::GError,
+    ) -> gboolean;
 
     //=========================================================================
     // OstreeRepoFinder
     //=========================================================================
     pub fn ostree_repo_finder_get_type() -> GType;
     #[cfg(any(feature = "v2018_6", feature = "dox"))]
-    pub fn ostree_repo_finder_resolve_all_async(finders: *const *mut OstreeRepoFinder, refs: *const *const OstreeCollectionRef, parent_repo: *mut OstreeRepo, cancellable: *mut gio::GCancellable, callback: gio::GAsyncReadyCallback, user_data: gpointer);
+    #[cfg_attr(feature = "dox", doc(cfg(feature = "v2018_6")))]
+    pub fn ostree_repo_finder_resolve_all_async(
+        finders: *const *mut OstreeRepoFinder,
+        refs: *const *const OstreeCollectionRef,
+        parent_repo: *mut OstreeRepo,
+        cancellable: *mut gio::GCancellable,
+        callback: gio::GAsyncReadyCallback,
+        user_data: gpointer,
+    );
     #[cfg(any(feature = "v2018_6", feature = "dox"))]
-    pub fn ostree_repo_finder_resolve_all_finish(result: *mut gio::GAsyncResult, error: *mut *mut glib::GError) -> *mut glib::GPtrArray;
+    #[cfg_attr(feature = "dox", doc(cfg(feature = "v2018_6")))]
+    pub fn ostree_repo_finder_resolve_all_finish(
+        result: *mut gio::GAsyncResult,
+        error: *mut *mut glib::GError,
+    ) -> *mut glib::GPtrArray;
     #[cfg(any(feature = "v2018_6", feature = "dox"))]
-    pub fn ostree_repo_finder_resolve_async(self_: *mut OstreeRepoFinder, refs: *const *const OstreeCollectionRef, parent_repo: *mut OstreeRepo, cancellable: *mut gio::GCancellable, callback: gio::GAsyncReadyCallback, user_data: gpointer);
+    #[cfg_attr(feature = "dox", doc(cfg(feature = "v2018_6")))]
+    pub fn ostree_repo_finder_resolve_async(
+        self_: *mut OstreeRepoFinder,
+        refs: *const *const OstreeCollectionRef,
+        parent_repo: *mut OstreeRepo,
+        cancellable: *mut gio::GCancellable,
+        callback: gio::GAsyncReadyCallback,
+        user_data: gpointer,
+    );
     #[cfg(any(feature = "v2018_6", feature = "dox"))]
-    pub fn ostree_repo_finder_resolve_finish(self_: *mut OstreeRepoFinder, result: *mut gio::GAsyncResult, error: *mut *mut glib::GError) -> *mut glib::GPtrArray;
+    #[cfg_attr(feature = "dox", doc(cfg(feature = "v2018_6")))]
+    pub fn ostree_repo_finder_resolve_finish(
+        self_: *mut OstreeRepoFinder,
+        result: *mut gio::GAsyncResult,
+        error: *mut *mut glib::GError,
+    ) -> *mut glib::GPtrArray;
 
     //=========================================================================
     // OstreeSign
     //=========================================================================
     pub fn ostree_sign_get_type() -> GType;
     #[cfg(any(feature = "v2020_2", feature = "dox"))]
+    #[cfg_attr(feature = "dox", doc(cfg(feature = "v2020_2")))]
     pub fn ostree_sign_get_all() -> *mut glib::GPtrArray;
     #[cfg(any(feature = "v2020_2", feature = "dox"))]
-    pub fn ostree_sign_get_by_name(name: *const c_char, error: *mut *mut glib::GError) -> *mut OstreeSign;
+    #[cfg_attr(feature = "dox", doc(cfg(feature = "v2020_2")))]
+    pub fn ostree_sign_get_by_name(
+        name: *const c_char,
+        error: *mut *mut glib::GError,
+    ) -> *mut OstreeSign;
     #[cfg(any(feature = "v2020_2", feature = "dox"))]
-    pub fn ostree_sign_add_pk(self_: *mut OstreeSign, public_key: *mut glib::GVariant, error: *mut *mut glib::GError) -> gboolean;
+    #[cfg_attr(feature = "dox", doc(cfg(feature = "v2020_2")))]
+    pub fn ostree_sign_add_pk(
+        self_: *mut OstreeSign,
+        public_key: *mut glib::GVariant,
+        error: *mut *mut glib::GError,
+    ) -> gboolean;
     #[cfg(any(feature = "v2020_2", feature = "dox"))]
-    pub fn ostree_sign_clear_keys(self_: *mut OstreeSign, error: *mut *mut glib::GError) -> gboolean;
+    #[cfg_attr(feature = "dox", doc(cfg(feature = "v2020_2")))]
+    pub fn ostree_sign_clear_keys(
+        self_: *mut OstreeSign,
+        error: *mut *mut glib::GError,
+    ) -> gboolean;
     #[cfg(any(feature = "v2020_2", feature = "dox"))]
-    pub fn ostree_sign_commit(self_: *mut OstreeSign, repo: *mut OstreeRepo, commit_checksum: *const c_char, cancellable: *mut gio::GCancellable, error: *mut *mut glib::GError) -> gboolean;
+    #[cfg_attr(feature = "dox", doc(cfg(feature = "v2020_2")))]
+    pub fn ostree_sign_commit(
+        self_: *mut OstreeSign,
+        repo: *mut OstreeRepo,
+        commit_checksum: *const c_char,
+        cancellable: *mut gio::GCancellable,
+        error: *mut *mut glib::GError,
+    ) -> gboolean;
     #[cfg(any(feature = "v2020_2", feature = "dox"))]
-    pub fn ostree_sign_commit_verify(self_: *mut OstreeSign, repo: *mut OstreeRepo, commit_checksum: *const c_char, out_success_message: *mut *mut c_char, cancellable: *mut gio::GCancellable, error: *mut *mut glib::GError) -> gboolean;
+    #[cfg_attr(feature = "dox", doc(cfg(feature = "v2020_2")))]
+    pub fn ostree_sign_commit_verify(
+        self_: *mut OstreeSign,
+        repo: *mut OstreeRepo,
+        commit_checksum: *const c_char,
+        out_success_message: *mut *mut c_char,
+        cancellable: *mut gio::GCancellable,
+        error: *mut *mut glib::GError,
+    ) -> gboolean;
     #[cfg(any(feature = "v2020_2", feature = "dox"))]
-    pub fn ostree_sign_data(self_: *mut OstreeSign, data: *mut glib::GBytes, signature: *mut *mut glib::GBytes, cancellable: *mut gio::GCancellable, error: *mut *mut glib::GError) -> gboolean;
+    #[cfg_attr(feature = "dox", doc(cfg(feature = "v2020_2")))]
+    pub fn ostree_sign_data(
+        self_: *mut OstreeSign,
+        data: *mut glib::GBytes,
+        signature: *mut *mut glib::GBytes,
+        cancellable: *mut gio::GCancellable,
+        error: *mut *mut glib::GError,
+    ) -> gboolean;
     #[cfg(any(feature = "v2020_2", feature = "dox"))]
-    pub fn ostree_sign_data_verify(self_: *mut OstreeSign, data: *mut glib::GBytes, signatures: *mut glib::GVariant, out_success_message: *mut *mut c_char, error: *mut *mut glib::GError) -> gboolean;
-    pub fn ostree_sign_dummy_add_pk(self_: *mut OstreeSign, key: *mut glib::GVariant, error: *mut *mut glib::GError) -> gboolean;
-    pub fn ostree_sign_dummy_data(self_: *mut OstreeSign, data: *mut glib::GBytes, signature: *mut *mut glib::GBytes, cancellable: *mut gio::GCancellable, error: *mut *mut glib::GError) -> gboolean;
-    pub fn ostree_sign_dummy_data_verify(self_: *mut OstreeSign, data: *mut glib::GBytes, signatures: *mut glib::GVariant, success_message: *mut *mut c_char, error: *mut *mut glib::GError) -> gboolean;
+    #[cfg_attr(feature = "dox", doc(cfg(feature = "v2020_2")))]
+    pub fn ostree_sign_data_verify(
+        self_: *mut OstreeSign,
+        data: *mut glib::GBytes,
+        signatures: *mut glib::GVariant,
+        out_success_message: *mut *mut c_char,
+        error: *mut *mut glib::GError,
+    ) -> gboolean;
+    pub fn ostree_sign_dummy_add_pk(
+        self_: *mut OstreeSign,
+        key: *mut glib::GVariant,
+        error: *mut *mut glib::GError,
+    ) -> gboolean;
+    pub fn ostree_sign_dummy_data(
+        self_: *mut OstreeSign,
+        data: *mut glib::GBytes,
+        signature: *mut *mut glib::GBytes,
+        cancellable: *mut gio::GCancellable,
+        error: *mut *mut glib::GError,
+    ) -> gboolean;
+    pub fn ostree_sign_dummy_data_verify(
+        self_: *mut OstreeSign,
+        data: *mut glib::GBytes,
+        signatures: *mut glib::GVariant,
+        success_message: *mut *mut c_char,
+        error: *mut *mut glib::GError,
+    ) -> gboolean;
     pub fn ostree_sign_dummy_get_name(self_: *mut OstreeSign) -> *const c_char;
     pub fn ostree_sign_dummy_metadata_format(self_: *mut OstreeSign) -> *const c_char;
     pub fn ostree_sign_dummy_metadata_key(self_: *mut OstreeSign) -> *const c_char;
-    pub fn ostree_sign_dummy_set_pk(self_: *mut OstreeSign, key: *mut glib::GVariant, error: *mut *mut glib::GError) -> gboolean;
-    pub fn ostree_sign_dummy_set_sk(self_: *mut OstreeSign, key: *mut glib::GVariant, error: *mut *mut glib::GError) -> gboolean;
-    pub fn ostree_sign_ed25519_add_pk(self_: *mut OstreeSign, public_key: *mut glib::GVariant, error: *mut *mut glib::GError) -> gboolean;
-    pub fn ostree_sign_ed25519_clear_keys(self_: *mut OstreeSign, error: *mut *mut glib::GError) -> gboolean;
-    pub fn ostree_sign_ed25519_data(self_: *mut OstreeSign, data: *mut glib::GBytes, signature: *mut *mut glib::GBytes, cancellable: *mut gio::GCancellable, error: *mut *mut glib::GError) -> gboolean;
-    pub fn ostree_sign_ed25519_data_verify(self_: *mut OstreeSign, data: *mut glib::GBytes, signatures: *mut glib::GVariant, out_success_message: *mut *mut c_char, error: *mut *mut glib::GError) -> gboolean;
+    pub fn ostree_sign_dummy_set_pk(
+        self_: *mut OstreeSign,
+        key: *mut glib::GVariant,
+        error: *mut *mut glib::GError,
+    ) -> gboolean;
+    pub fn ostree_sign_dummy_set_sk(
+        self_: *mut OstreeSign,
+        key: *mut glib::GVariant,
+        error: *mut *mut glib::GError,
+    ) -> gboolean;
+    pub fn ostree_sign_ed25519_add_pk(
+        self_: *mut OstreeSign,
+        public_key: *mut glib::GVariant,
+        error: *mut *mut glib::GError,
+    ) -> gboolean;
+    pub fn ostree_sign_ed25519_clear_keys(
+        self_: *mut OstreeSign,
+        error: *mut *mut glib::GError,
+    ) -> gboolean;
+    pub fn ostree_sign_ed25519_data(
+        self_: *mut OstreeSign,
+        data: *mut glib::GBytes,
+        signature: *mut *mut glib::GBytes,
+        cancellable: *mut gio::GCancellable,
+        error: *mut *mut glib::GError,
+    ) -> gboolean;
+    pub fn ostree_sign_ed25519_data_verify(
+        self_: *mut OstreeSign,
+        data: *mut glib::GBytes,
+        signatures: *mut glib::GVariant,
+        out_success_message: *mut *mut c_char,
+        error: *mut *mut glib::GError,
+    ) -> gboolean;
     pub fn ostree_sign_ed25519_get_name(self_: *mut OstreeSign) -> *const c_char;
-    pub fn ostree_sign_ed25519_load_pk(self_: *mut OstreeSign, options: *mut glib::GVariant, error: *mut *mut glib::GError) -> gboolean;
+    pub fn ostree_sign_ed25519_load_pk(
+        self_: *mut OstreeSign,
+        options: *mut glib::GVariant,
+        error: *mut *mut glib::GError,
+    ) -> gboolean;
     pub fn ostree_sign_ed25519_metadata_format(self_: *mut OstreeSign) -> *const c_char;
     pub fn ostree_sign_ed25519_metadata_key(self_: *mut OstreeSign) -> *const c_char;
-    pub fn ostree_sign_ed25519_set_pk(self_: *mut OstreeSign, public_key: *mut glib::GVariant, error: *mut *mut glib::GError) -> gboolean;
-    pub fn ostree_sign_ed25519_set_sk(self_: *mut OstreeSign, secret_key: *mut glib::GVariant, error: *mut *mut glib::GError) -> gboolean;
+    pub fn ostree_sign_ed25519_set_pk(
+        self_: *mut OstreeSign,
+        public_key: *mut glib::GVariant,
+        error: *mut *mut glib::GError,
+    ) -> gboolean;
+    pub fn ostree_sign_ed25519_set_sk(
+        self_: *mut OstreeSign,
+        secret_key: *mut glib::GVariant,
+        error: *mut *mut glib::GError,
+    ) -> gboolean;
     #[cfg(any(feature = "v2020_2", feature = "dox"))]
+    #[cfg_attr(feature = "dox", doc(cfg(feature = "v2020_2")))]
     pub fn ostree_sign_get_name(self_: *mut OstreeSign) -> *const c_char;
     #[cfg(any(feature = "v2020_2", feature = "dox"))]
-    pub fn ostree_sign_load_pk(self_: *mut OstreeSign, options: *mut glib::GVariant, error: *mut *mut glib::GError) -> gboolean;
+    #[cfg_attr(feature = "dox", doc(cfg(feature = "v2020_2")))]
+    pub fn ostree_sign_load_pk(
+        self_: *mut OstreeSign,
+        options: *mut glib::GVariant,
+        error: *mut *mut glib::GError,
+    ) -> gboolean;
     #[cfg(any(feature = "v2020_2", feature = "dox"))]
+    #[cfg_attr(feature = "dox", doc(cfg(feature = "v2020_2")))]
     pub fn ostree_sign_metadata_format(self_: *mut OstreeSign) -> *const c_char;
     #[cfg(any(feature = "v2020_2", feature = "dox"))]
+    #[cfg_attr(feature = "dox", doc(cfg(feature = "v2020_2")))]
     pub fn ostree_sign_metadata_key(self_: *mut OstreeSign) -> *const c_char;
     #[cfg(any(feature = "v2020_2", feature = "dox"))]
-    pub fn ostree_sign_set_pk(self_: *mut OstreeSign, public_key: *mut glib::GVariant, error: *mut *mut glib::GError) -> gboolean;
+    #[cfg_attr(feature = "dox", doc(cfg(feature = "v2020_2")))]
+    pub fn ostree_sign_set_pk(
+        self_: *mut OstreeSign,
+        public_key: *mut glib::GVariant,
+        error: *mut *mut glib::GError,
+    ) -> gboolean;
     #[cfg(any(feature = "v2020_2", feature = "dox"))]
-    pub fn ostree_sign_set_sk(self_: *mut OstreeSign, secret_key: *mut glib::GVariant, error: *mut *mut glib::GError) -> gboolean;
+    #[cfg_attr(feature = "dox", doc(cfg(feature = "v2020_2")))]
+    pub fn ostree_sign_set_sk(
+        self_: *mut OstreeSign,
+        secret_key: *mut glib::GVariant,
+        error: *mut *mut glib::GError,
+    ) -> gboolean;
     #[cfg(any(feature = "v2020_2", feature = "dox"))]
-    pub fn ostree_sign_summary(self_: *mut OstreeSign, repo: *mut OstreeRepo, keys: *mut glib::GVariant, cancellable: *mut gio::GCancellable, error: *mut *mut glib::GError) -> gboolean;
+    #[cfg_attr(feature = "dox", doc(cfg(feature = "v2020_2")))]
+    pub fn ostree_sign_summary(
+        self_: *mut OstreeSign,
+        repo: *mut OstreeRepo,
+        keys: *mut glib::GVariant,
+        cancellable: *mut gio::GCancellable,
+        error: *mut *mut glib::GError,
+    ) -> gboolean;
 
     //=========================================================================
     // Other functions
     //=========================================================================
     #[cfg(any(feature = "v2017_15", feature = "dox"))]
-    pub fn ostree_break_hardlink(dfd: c_int, path: *const c_char, skip_xattrs: gboolean, cancellable: *mut gio::GCancellable, error: *mut *mut glib::GError) -> gboolean;
+    #[cfg_attr(feature = "dox", doc(cfg(feature = "v2017_15")))]
+    pub fn ostree_break_hardlink(
+        dfd: c_int,
+        path: *const c_char,
+        skip_xattrs: gboolean,
+        cancellable: *mut gio::GCancellable,
+        error: *mut *mut glib::GError,
+    ) -> gboolean;
     #[cfg(any(feature = "v2017_4", feature = "dox"))]
+    #[cfg_attr(feature = "dox", doc(cfg(feature = "v2017_4")))]
     pub fn ostree_check_version(required_year: c_uint, required_release: c_uint) -> gboolean;
     #[cfg(any(feature = "v2016_8", feature = "dox"))]
+    #[cfg_attr(feature = "dox", doc(cfg(feature = "v2016_8")))]
     pub fn ostree_checksum_b64_from_bytes(csum: *const [c_uchar; 32]) -> *mut c_char;
     pub fn ostree_checksum_b64_inplace_from_bytes(csum: *const [c_uchar; 32], buf: *mut c_char);
     pub fn ostree_checksum_b64_inplace_to_bytes(checksum: *const [c_char; 32], buf: *mut u8);
     #[cfg(any(feature = "v2016_8", feature = "dox"))]
+    #[cfg_attr(feature = "dox", doc(cfg(feature = "v2016_8")))]
     pub fn ostree_checksum_b64_to_bytes(checksum: *const c_char) -> *mut [c_uchar; 32];
     pub fn ostree_checksum_bytes_peek(bytes: *mut glib::GVariant) -> *const [c_uchar; 32];
-    pub fn ostree_checksum_bytes_peek_validate(bytes: *mut glib::GVariant, error: *mut *mut glib::GError) -> *const [c_uchar; 32];
-    pub fn ostree_checksum_file(f: *mut gio::GFile, objtype: OstreeObjectType, out_csum: *mut *mut [*mut u8; 32], cancellable: *mut gio::GCancellable, error: *mut *mut glib::GError) -> gboolean;
-    pub fn ostree_checksum_file_async(f: *mut gio::GFile, objtype: OstreeObjectType, io_priority: c_int, cancellable: *mut gio::GCancellable, callback: gio::GAsyncReadyCallback, user_data: gpointer);
-    pub fn ostree_checksum_file_async_finish(f: *mut gio::GFile, result: *mut gio::GAsyncResult, out_csum: *mut *mut [*mut u8; 32], error: *mut *mut glib::GError) -> gboolean;
+    pub fn ostree_checksum_bytes_peek_validate(
+        bytes: *mut glib::GVariant,
+        error: *mut *mut glib::GError,
+    ) -> *const [c_uchar; 32];
+    pub fn ostree_checksum_file(
+        f: *mut gio::GFile,
+        objtype: OstreeObjectType,
+        out_csum: *mut *mut [*mut u8; 32],
+        cancellable: *mut gio::GCancellable,
+        error: *mut *mut glib::GError,
+    ) -> gboolean;
+    pub fn ostree_checksum_file_async(
+        f: *mut gio::GFile,
+        objtype: OstreeObjectType,
+        io_priority: c_int,
+        cancellable: *mut gio::GCancellable,
+        callback: gio::GAsyncReadyCallback,
+        user_data: gpointer,
+    );
+    pub fn ostree_checksum_file_async_finish(
+        f: *mut gio::GFile,
+        result: *mut gio::GAsyncResult,
+        out_csum: *mut *mut [*mut u8; 32],
+        error: *mut *mut glib::GError,
+    ) -> gboolean;
     #[cfg(any(feature = "v2017_13", feature = "dox"))]
-    pub fn ostree_checksum_file_at(dfd: c_int, path: *const c_char, stbuf: *mut stat, objtype: OstreeObjectType, flags: OstreeChecksumFlags, out_checksum: *mut *mut c_char, cancellable: *mut gio::GCancellable, error: *mut *mut glib::GError) -> gboolean;
-    pub fn ostree_checksum_file_from_input(file_info: *mut gio::GFileInfo, xattrs: *mut glib::GVariant, in_: *mut gio::GInputStream, objtype: OstreeObjectType, out_csum: *mut *mut [*mut u8; 32], cancellable: *mut gio::GCancellable, error: *mut *mut glib::GError) -> gboolean;
+    #[cfg_attr(feature = "dox", doc(cfg(feature = "v2017_13")))]
+    pub fn ostree_checksum_file_at(
+        dfd: c_int,
+        path: *const c_char,
+        stbuf: *mut stat,
+        objtype: OstreeObjectType,
+        flags: OstreeChecksumFlags,
+        out_checksum: *mut *mut c_char,
+        cancellable: *mut gio::GCancellable,
+        error: *mut *mut glib::GError,
+    ) -> gboolean;
+    pub fn ostree_checksum_file_from_input(
+        file_info: *mut gio::GFileInfo,
+        xattrs: *mut glib::GVariant,
+        in_: *mut gio::GInputStream,
+        objtype: OstreeObjectType,
+        out_csum: *mut *mut [*mut u8; 32],
+        cancellable: *mut gio::GCancellable,
+        error: *mut *mut glib::GError,
+    ) -> gboolean;
     pub fn ostree_checksum_from_bytes(csum: *const [c_uchar; 32]) -> *mut c_char;
     pub fn ostree_checksum_from_bytes_v(csum_v: *mut glib::GVariant) -> *mut c_char;
     pub fn ostree_checksum_inplace_from_bytes(csum: *const [c_uchar; 32], buf: *mut c_char);
@@ -1731,50 +3520,198 @@ extern "C" {
     //pub fn ostree_cmd__private__() -> /*Ignored*/*const OstreeCmdPrivateVTable;
     pub fn ostree_cmp_checksum_bytes(a: *const u8, b: *const u8) -> c_int;
     #[cfg(any(feature = "v2018_2", feature = "dox"))]
+    #[cfg_attr(feature = "dox", doc(cfg(feature = "v2018_2")))]
     pub fn ostree_commit_get_content_checksum(commit_variant: *mut glib::GVariant) -> *mut c_char;
     #[cfg(any(feature = "v2020_1", feature = "dox"))]
-    pub fn ostree_commit_get_object_sizes(commit_variant: *mut glib::GVariant, out_sizes_entries: *mut *mut glib::GPtrArray, error: *mut *mut glib::GError) -> gboolean;
+    #[cfg_attr(feature = "dox", doc(cfg(feature = "v2020_1")))]
+    pub fn ostree_commit_get_object_sizes(
+        commit_variant: *mut glib::GVariant,
+        out_sizes_entries: *mut *mut glib::GPtrArray,
+        error: *mut *mut glib::GError,
+    ) -> gboolean;
     pub fn ostree_commit_get_parent(commit_variant: *mut glib::GVariant) -> *mut c_char;
     #[cfg(any(feature = "v2016_3", feature = "dox"))]
+    #[cfg_attr(feature = "dox", doc(cfg(feature = "v2016_3")))]
     pub fn ostree_commit_get_timestamp(commit_variant: *mut glib::GVariant) -> u64;
     #[cfg(any(feature = "v2021_1", feature = "dox"))]
-    pub fn ostree_commit_metadata_for_bootable(root: *mut gio::GFile, dict: *mut glib::GVariantDict, cancellable: *mut gio::GCancellable, error: *mut *mut glib::GError) -> gboolean;
-    pub fn ostree_content_file_parse(compressed: gboolean, content_path: *mut gio::GFile, trusted: gboolean, out_input: *mut *mut gio::GInputStream, out_file_info: *mut *mut gio::GFileInfo, out_xattrs: *mut *mut glib::GVariant, cancellable: *mut gio::GCancellable, error: *mut *mut glib::GError) -> gboolean;
-    pub fn ostree_content_file_parse_at(compressed: gboolean, parent_dfd: c_int, path: *const c_char, trusted: gboolean, out_input: *mut *mut gio::GInputStream, out_file_info: *mut *mut gio::GFileInfo, out_xattrs: *mut *mut glib::GVariant, cancellable: *mut gio::GCancellable, error: *mut *mut glib::GError) -> gboolean;
-    pub fn ostree_content_stream_parse(compressed: gboolean, input: *mut gio::GInputStream, input_length: u64, trusted: gboolean, out_input: *mut *mut gio::GInputStream, out_file_info: *mut *mut gio::GFileInfo, out_xattrs: *mut *mut glib::GVariant, cancellable: *mut gio::GCancellable, error: *mut *mut glib::GError) -> gboolean;
-    pub fn ostree_create_directory_metadata(dir_info: *mut gio::GFileInfo, xattrs: *mut glib::GVariant) -> *mut glib::GVariant;
-    pub fn ostree_diff_dirs(flags: OstreeDiffFlags, a: *mut gio::GFile, b: *mut gio::GFile, modified: *mut glib::GPtrArray, removed: *mut glib::GPtrArray, added: *mut glib::GPtrArray, cancellable: *mut gio::GCancellable, error: *mut *mut glib::GError) -> gboolean;
+    #[cfg_attr(feature = "dox", doc(cfg(feature = "v2021_1")))]
+    pub fn ostree_commit_metadata_for_bootable(
+        root: *mut gio::GFile,
+        dict: *mut glib::GVariantDict,
+        cancellable: *mut gio::GCancellable,
+        error: *mut *mut glib::GError,
+    ) -> gboolean;
+    pub fn ostree_content_file_parse(
+        compressed: gboolean,
+        content_path: *mut gio::GFile,
+        trusted: gboolean,
+        out_input: *mut *mut gio::GInputStream,
+        out_file_info: *mut *mut gio::GFileInfo,
+        out_xattrs: *mut *mut glib::GVariant,
+        cancellable: *mut gio::GCancellable,
+        error: *mut *mut glib::GError,
+    ) -> gboolean;
+    pub fn ostree_content_file_parse_at(
+        compressed: gboolean,
+        parent_dfd: c_int,
+        path: *const c_char,
+        trusted: gboolean,
+        out_input: *mut *mut gio::GInputStream,
+        out_file_info: *mut *mut gio::GFileInfo,
+        out_xattrs: *mut *mut glib::GVariant,
+        cancellable: *mut gio::GCancellable,
+        error: *mut *mut glib::GError,
+    ) -> gboolean;
+    pub fn ostree_content_stream_parse(
+        compressed: gboolean,
+        input: *mut gio::GInputStream,
+        input_length: u64,
+        trusted: gboolean,
+        out_input: *mut *mut gio::GInputStream,
+        out_file_info: *mut *mut gio::GFileInfo,
+        out_xattrs: *mut *mut glib::GVariant,
+        cancellable: *mut gio::GCancellable,
+        error: *mut *mut glib::GError,
+    ) -> gboolean;
+    pub fn ostree_create_directory_metadata(
+        dir_info: *mut gio::GFileInfo,
+        xattrs: *mut glib::GVariant,
+    ) -> *mut glib::GVariant;
+    pub fn ostree_diff_dirs(
+        flags: OstreeDiffFlags,
+        a: *mut gio::GFile,
+        b: *mut gio::GFile,
+        modified: *mut glib::GPtrArray,
+        removed: *mut glib::GPtrArray,
+        added: *mut glib::GPtrArray,
+        cancellable: *mut gio::GCancellable,
+        error: *mut *mut glib::GError,
+    ) -> gboolean;
     #[cfg(any(feature = "v2017_4", feature = "dox"))]
-    pub fn ostree_diff_dirs_with_options(flags: OstreeDiffFlags, a: *mut gio::GFile, b: *mut gio::GFile, modified: *mut glib::GPtrArray, removed: *mut glib::GPtrArray, added: *mut glib::GPtrArray, options: *mut OstreeDiffDirsOptions, cancellable: *mut gio::GCancellable, error: *mut *mut glib::GError) -> gboolean;
-    pub fn ostree_diff_print(a: *mut gio::GFile, b: *mut gio::GFile, modified: *mut glib::GPtrArray, removed: *mut glib::GPtrArray, added: *mut glib::GPtrArray);
+    #[cfg_attr(feature = "dox", doc(cfg(feature = "v2017_4")))]
+    pub fn ostree_diff_dirs_with_options(
+        flags: OstreeDiffFlags,
+        a: *mut gio::GFile,
+        b: *mut gio::GFile,
+        modified: *mut glib::GPtrArray,
+        removed: *mut glib::GPtrArray,
+        added: *mut glib::GPtrArray,
+        options: *mut OstreeDiffDirsOptions,
+        cancellable: *mut gio::GCancellable,
+        error: *mut *mut glib::GError,
+    ) -> gboolean;
+    pub fn ostree_diff_print(
+        a: *mut gio::GFile,
+        b: *mut gio::GFile,
+        modified: *mut glib::GPtrArray,
+        removed: *mut glib::GPtrArray,
+        added: *mut glib::GPtrArray,
+    );
     #[cfg(any(feature = "v2017_10", feature = "dox"))]
+    #[cfg_attr(feature = "dox", doc(cfg(feature = "v2017_10")))]
     pub fn ostree_gpg_error_quark() -> glib::GQuark;
     pub fn ostree_hash_object_name(a: gconstpointer) -> c_uint;
     pub fn ostree_metadata_variant_type(objtype: OstreeObjectType) -> *const glib::GVariantType;
-    pub fn ostree_object_from_string(str: *const c_char, out_checksum: *mut *mut c_char, out_objtype: *mut OstreeObjectType);
-    pub fn ostree_object_name_deserialize(variant: *mut glib::GVariant, out_checksum: *mut *const c_char, out_objtype: *mut OstreeObjectType);
-    pub fn ostree_object_name_serialize(checksum: *const c_char, objtype: OstreeObjectType) -> *mut glib::GVariant;
-    pub fn ostree_object_to_string(checksum: *const c_char, objtype: OstreeObjectType) -> *mut c_char;
+    pub fn ostree_object_from_string(
+        str: *const c_char,
+        out_checksum: *mut *mut c_char,
+        out_objtype: *mut OstreeObjectType,
+    );
+    pub fn ostree_object_name_deserialize(
+        variant: *mut glib::GVariant,
+        out_checksum: *mut *const c_char,
+        out_objtype: *mut OstreeObjectType,
+    );
+    pub fn ostree_object_name_serialize(
+        checksum: *const c_char,
+        objtype: OstreeObjectType,
+    ) -> *mut glib::GVariant;
+    pub fn ostree_object_to_string(
+        checksum: *const c_char,
+        objtype: OstreeObjectType,
+    ) -> *mut c_char;
     pub fn ostree_object_type_from_string(str: *const c_char) -> OstreeObjectType;
     pub fn ostree_object_type_to_string(objtype: OstreeObjectType) -> *const c_char;
-    pub fn ostree_parse_refspec(refspec: *const c_char, out_remote: *mut *mut c_char, out_ref: *mut *mut c_char, error: *mut *mut glib::GError) -> gboolean;
+    pub fn ostree_parse_refspec(
+        refspec: *const c_char,
+        out_remote: *mut *mut c_char,
+        out_ref: *mut *mut c_char,
+        error: *mut *mut glib::GError,
+    ) -> gboolean;
     #[cfg(any(feature = "v2016_6", feature = "dox"))]
-    pub fn ostree_raw_file_to_archive_z2_stream(input: *mut gio::GInputStream, file_info: *mut gio::GFileInfo, xattrs: *mut glib::GVariant, out_input: *mut *mut gio::GInputStream, cancellable: *mut gio::GCancellable, error: *mut *mut glib::GError) -> gboolean;
+    #[cfg_attr(feature = "dox", doc(cfg(feature = "v2016_6")))]
+    pub fn ostree_raw_file_to_archive_z2_stream(
+        input: *mut gio::GInputStream,
+        file_info: *mut gio::GFileInfo,
+        xattrs: *mut glib::GVariant,
+        out_input: *mut *mut gio::GInputStream,
+        cancellable: *mut gio::GCancellable,
+        error: *mut *mut glib::GError,
+    ) -> gboolean;
     #[cfg(any(feature = "v2017_3", feature = "dox"))]
-    pub fn ostree_raw_file_to_archive_z2_stream_with_options(input: *mut gio::GInputStream, file_info: *mut gio::GFileInfo, xattrs: *mut glib::GVariant, options: *mut glib::GVariant, out_input: *mut *mut gio::GInputStream, cancellable: *mut gio::GCancellable, error: *mut *mut glib::GError) -> gboolean;
-    pub fn ostree_raw_file_to_content_stream(input: *mut gio::GInputStream, file_info: *mut gio::GFileInfo, xattrs: *mut glib::GVariant, out_input: *mut *mut gio::GInputStream, out_length: *mut u64, cancellable: *mut gio::GCancellable, error: *mut *mut glib::GError) -> gboolean;
-    pub fn ostree_validate_checksum_string(sha256: *const c_char, error: *mut *mut glib::GError) -> gboolean;
+    #[cfg_attr(feature = "dox", doc(cfg(feature = "v2017_3")))]
+    pub fn ostree_raw_file_to_archive_z2_stream_with_options(
+        input: *mut gio::GInputStream,
+        file_info: *mut gio::GFileInfo,
+        xattrs: *mut glib::GVariant,
+        options: *mut glib::GVariant,
+        out_input: *mut *mut gio::GInputStream,
+        cancellable: *mut gio::GCancellable,
+        error: *mut *mut glib::GError,
+    ) -> gboolean;
+    pub fn ostree_raw_file_to_content_stream(
+        input: *mut gio::GInputStream,
+        file_info: *mut gio::GFileInfo,
+        xattrs: *mut glib::GVariant,
+        out_input: *mut *mut gio::GInputStream,
+        out_length: *mut u64,
+        cancellable: *mut gio::GCancellable,
+        error: *mut *mut glib::GError,
+    ) -> gboolean;
+    pub fn ostree_validate_checksum_string(
+        sha256: *const c_char,
+        error: *mut *mut glib::GError,
+    ) -> gboolean;
     #[cfg(any(feature = "v2018_6", feature = "dox"))]
-    pub fn ostree_validate_collection_id(collection_id: *const c_char, error: *mut *mut glib::GError) -> gboolean;
+    #[cfg_attr(feature = "dox", doc(cfg(feature = "v2018_6")))]
+    pub fn ostree_validate_collection_id(
+        collection_id: *const c_char,
+        error: *mut *mut glib::GError,
+    ) -> gboolean;
     #[cfg(any(feature = "v2017_8", feature = "dox"))]
-    pub fn ostree_validate_remote_name(remote_name: *const c_char, error: *mut *mut glib::GError) -> gboolean;
+    #[cfg_attr(feature = "dox", doc(cfg(feature = "v2017_8")))]
+    pub fn ostree_validate_remote_name(
+        remote_name: *const c_char,
+        error: *mut *mut glib::GError,
+    ) -> gboolean;
     pub fn ostree_validate_rev(rev: *const c_char, error: *mut *mut glib::GError) -> gboolean;
-    pub fn ostree_validate_structureof_checksum_string(checksum: *const c_char, error: *mut *mut glib::GError) -> gboolean;
-    pub fn ostree_validate_structureof_commit(commit: *mut glib::GVariant, error: *mut *mut glib::GError) -> gboolean;
-    pub fn ostree_validate_structureof_csum_v(checksum: *mut glib::GVariant, error: *mut *mut glib::GError) -> gboolean;
-    pub fn ostree_validate_structureof_dirmeta(dirmeta: *mut glib::GVariant, error: *mut *mut glib::GError) -> gboolean;
-    pub fn ostree_validate_structureof_dirtree(dirtree: *mut glib::GVariant, error: *mut *mut glib::GError) -> gboolean;
-    pub fn ostree_validate_structureof_file_mode(mode: u32, error: *mut *mut glib::GError) -> gboolean;
-    pub fn ostree_validate_structureof_objtype(objtype: c_uchar, error: *mut *mut glib::GError) -> gboolean;
+    pub fn ostree_validate_structureof_checksum_string(
+        checksum: *const c_char,
+        error: *mut *mut glib::GError,
+    ) -> gboolean;
+    pub fn ostree_validate_structureof_commit(
+        commit: *mut glib::GVariant,
+        error: *mut *mut glib::GError,
+    ) -> gboolean;
+    pub fn ostree_validate_structureof_csum_v(
+        checksum: *mut glib::GVariant,
+        error: *mut *mut glib::GError,
+    ) -> gboolean;
+    pub fn ostree_validate_structureof_dirmeta(
+        dirmeta: *mut glib::GVariant,
+        error: *mut *mut glib::GError,
+    ) -> gboolean;
+    pub fn ostree_validate_structureof_dirtree(
+        dirtree: *mut glib::GVariant,
+        error: *mut *mut glib::GError,
+    ) -> gboolean;
+    pub fn ostree_validate_structureof_file_mode(
+        mode: u32,
+        error: *mut *mut glib::GError,
+    ) -> gboolean;
+    pub fn ostree_validate_structureof_objtype(
+        objtype: c_uchar,
+        error: *mut *mut glib::GError,
+    ) -> gboolean;
 
 }
index 10d9ac4b1b9d174ae5f95518925e9654ad70e6fb..183c2e34536d53d8c3f3c688a8e4ec833cc156a4 100644 (file)
@@ -1,18 +1,16 @@
 // This file was generated by gir (https://github.com/gtk-rs/gir)
-// from gir-files (https://github.com/gtk-rs/gir-files)
+// from gir-files
 // DO NOT EDIT
 
-extern crate ostree_sys;
-extern crate shell_words;
-extern crate tempfile;
+use ostree_sys::*;
 use std::env;
 use std::error::Error;
-use std::path::Path;
+use std::ffi::OsString;
 use std::mem::{align_of, size_of};
+use std::path::Path;
 use std::process::Command;
 use std::str;
 use tempfile::Builder;
-use ostree_sys::*;
 
 static PACKAGES: &[&str] = &["ostree-1"];
 
@@ -22,23 +20,17 @@ struct Compiler {
 }
 
 impl Compiler {
-    pub fn new() -> Result<Compiler, Box<dyn Error>> {
+    pub fn new() -> Result<Self, Box<dyn Error>> {
         let mut args = get_var("CC", "cc")?;
         args.push("-Wno-deprecated-declarations".to_owned());
+        // For _Generic
+        args.push("-std=c11".to_owned());
         // For %z support in printf when using MinGW.
         args.push("-D__USE_MINGW_ANSI_STDIO".to_owned());
         args.extend(get_var("CFLAGS", "")?);
         args.extend(get_var("CPPFLAGS", "")?);
         args.extend(pkg_config_cflags(PACKAGES)?);
-        Ok(Compiler { args })
-    }
-
-    pub fn define<'a, V: Into<Option<&'a str>>>(&mut self, var: &str, val: V) {
-        let arg = match val.into() {
-            None => format!("-D{}", var),
-            Some(val) => format!("-D{}={}", var, val),
-        };
-        self.args.push(arg);
+        Ok(Self { args })
     }
 
     pub fn compile(&self, src: &Path, out: &Path) -> Result<(), Box<dyn Error>> {
@@ -48,8 +40,7 @@ impl Compiler {
         cmd.arg(out);
         let status = cmd.spawn()?.wait()?;
         if !status.success() {
-            return Err(format!("compilation command {:?} failed, {}",
-                               &cmd, status).into());
+            return Err(format!("compilation command {:?} failed, {}", &cmd, status).into());
         }
         Ok(())
     }
@@ -73,19 +64,18 @@ fn pkg_config_cflags(packages: &[&str]) -> Result<Vec<String>, Box<dyn Error>> {
     if packages.is_empty() {
         return Ok(Vec::new());
     }
-    let mut cmd = Command::new("pkg-config");
+    let pkg_config = env::var_os("PKG_CONFIG").unwrap_or_else(|| OsString::from("pkg-config"));
+    let mut cmd = Command::new(pkg_config);
     cmd.arg("--cflags");
     cmd.args(packages);
     let out = cmd.output()?;
     if !out.status.success() {
-        return Err(format!("command {:?} returned {}",
-                           &cmd, out.status).into());
+        return Err(format!("command {:?} returned {}", &cmd, out.status).into());
     }
     let stdout = str::from_utf8(&out.stdout)?;
     Ok(shell_words::split(stdout.trim())?)
 }
 
-
 #[derive(Copy, Clone, Debug, Eq, PartialEq)]
 struct Layout {
     size: usize,
@@ -98,8 +88,6 @@ struct Results {
     passed: usize,
     /// Total number of failed tests (including those that failed to compile).
     failed: usize,
-    /// Number of tests that failed to compile.
-    failed_to_compile: usize,
 }
 
 impl Results {
@@ -109,16 +97,8 @@ impl Results {
     fn record_failed(&mut self) {
         self.failed += 1;
     }
-    fn record_failed_to_compile(&mut self) {
-        self.failed += 1;
-        self.failed_to_compile += 1;
-    }
     fn summary(&self) -> String {
-        format!(
-            "{} passed; {} failed (compilation errors: {})",
-            self.passed,
-            self.failed,
-            self.failed_to_compile)
+        format!("{} passed; {} failed", self.passed, self.failed)
     }
     fn expect_total_success(&self) {
         if self.failed == 0 {
@@ -131,166 +111,469 @@ impl Results {
 
 #[test]
 fn cross_validate_constants_with_c() {
-    let tmpdir = Builder::new().prefix("abi").tempdir().expect("temporary directory");
-    let cc = Compiler::new().expect("configured compiler");
+    let mut c_constants: Vec<(String, String)> = Vec::new();
 
-    assert_eq!("1",
-               get_c_value(tmpdir.path(), &cc, "1").expect("C constant"),
-               "failed to obtain correct constant value for 1");
+    for l in get_c_output("constant").unwrap().lines() {
+        let mut words = l.trim().split(';');
+        let name = words.next().expect("Failed to parse name").to_owned();
+        let value = words
+            .next()
+            .and_then(|s| s.parse().ok())
+            .expect("Failed to parse value");
+        c_constants.push((name, value));
+    }
 
-    let mut results : Results = Default::default();
-    for (i, &(name, rust_value)) in RUST_CONSTANTS.iter().enumerate() {
-        match get_c_value(tmpdir.path(), &cc, name) {
-            Err(e) => {
-                results.record_failed_to_compile();
-                eprintln!("{}", e);
-            },
-            Ok(ref c_value) => {
-                if rust_value == c_value {
-                    results.record_passed();
-                } else {
-                    results.record_failed();
-                    eprintln!("Constant value mismatch for {}\nRust: {:?}\nC:    {:?}",
-                              name, rust_value, c_value);
-                }
-            }
-        };
-        if (i + 1) % 25 == 0 {
-            println!("constants ... {}", results.summary());
+    let mut results = Results::default();
+
+    for ((rust_name, rust_value), (c_name, c_value)) in
+        RUST_CONSTANTS.iter().zip(c_constants.iter())
+    {
+        if rust_name != c_name {
+            results.record_failed();
+            eprintln!("Name mismatch:\nRust: {:?}\nC:    {:?}", rust_name, c_name,);
+            continue;
         }
+
+        if rust_value != c_value {
+            results.record_failed();
+            eprintln!(
+                "Constant value mismatch for {}\nRust: {:?}\nC:    {:?}",
+                rust_name, rust_value, &c_value
+            );
+            continue;
+        }
+
+        results.record_passed();
     }
+
     results.expect_total_success();
 }
 
 #[test]
 fn cross_validate_layout_with_c() {
-    let tmpdir = Builder::new().prefix("abi").tempdir().expect("temporary directory");
-    let cc = Compiler::new().expect("configured compiler");
+    let mut c_layouts = Vec::new();
 
-    assert_eq!(Layout {size: 1, alignment: 1},
-               get_c_layout(tmpdir.path(), &cc, "char").expect("C layout"),
-               "failed to obtain correct layout for char type");
+    for l in get_c_output("layout").unwrap().lines() {
+        let mut words = l.trim().split(';');
+        let name = words.next().expect("Failed to parse name").to_owned();
+        let size = words
+            .next()
+            .and_then(|s| s.parse().ok())
+            .expect("Failed to parse size");
+        let alignment = words
+            .next()
+            .and_then(|s| s.parse().ok())
+            .expect("Failed to parse alignment");
+        c_layouts.push((name, Layout { size, alignment }));
+    }
 
-    let mut results : Results = Default::default();
-    for (i, &(name, rust_layout)) in RUST_LAYOUTS.iter().enumerate() {
-        match get_c_layout(tmpdir.path(), &cc, name) {
-            Err(e) => {
-                results.record_failed_to_compile();
-                eprintln!("{}", e);
-            },
-            Ok(c_layout) => {
-                if rust_layout == c_layout {
-                    results.record_passed();
-                } else {
-                    results.record_failed();
-                    eprintln!("Layout mismatch for {}\nRust: {:?}\nC:    {:?}",
-                              name, rust_layout, &c_layout);
-                }
-            }
-        };
-        if (i + 1) % 25 == 0 {
-            println!("layout    ... {}", results.summary());
+    let mut results = Results::default();
+
+    for ((rust_name, rust_layout), (c_name, c_layout)) in RUST_LAYOUTS.iter().zip(c_layouts.iter())
+    {
+        if rust_name != c_name {
+            results.record_failed();
+            eprintln!("Name mismatch:\nRust: {:?}\nC:    {:?}", rust_name, c_name,);
+            continue;
         }
-    }
-    results.expect_total_success();
-}
 
-fn get_c_layout(dir: &Path, cc: &Compiler, name: &str) -> Result<Layout, Box<dyn Error>> {
-    let exe = dir.join("layout");
-    let mut cc = cc.clone();
-    cc.define("ABI_TYPE_NAME", name);
-    cc.compile(Path::new("tests/layout.c"), &exe)?;
+        if rust_layout != c_layout {
+            results.record_failed();
+            eprintln!(
+                "Layout mismatch for {}\nRust: {:?}\nC:    {:?}",
+                rust_name, rust_layout, &c_layout
+            );
+            continue;
+        }
 
-    let mut abi_cmd = Command::new(exe);
-    let output = abi_cmd.output()?;
-    if !output.status.success() {
-        return Err(format!("command {:?} failed, {:?}",
-                           &abi_cmd, &output).into());
+        results.record_passed();
     }
 
-    let stdout = str::from_utf8(&output.stdout)?;
-    let mut words = stdout.trim().split_whitespace();
-    let size = words.next().unwrap().parse().unwrap();
-    let alignment = words.next().unwrap().parse().unwrap();
-    Ok(Layout {size, alignment})
+    results.expect_total_success();
 }
 
-fn get_c_value(dir: &Path, cc: &Compiler, name: &str) -> Result<String, Box<dyn Error>> {
-    let exe = dir.join("constant");
-    let mut cc = cc.clone();
-    cc.define("ABI_CONSTANT_NAME", name);
-    cc.compile(Path::new("tests/constant.c"), &exe)?;
+fn get_c_output(name: &str) -> Result<String, Box<dyn Error>> {
+    let tmpdir = Builder::new().prefix("abi").tempdir()?;
+    let exe = tmpdir.path().join(name);
+    let c_file = Path::new("tests").join(name).with_extension("c");
+
+    let cc = Compiler::new().expect("configured compiler");
+    cc.compile(&c_file, &exe)?;
 
     let mut abi_cmd = Command::new(exe);
     let output = abi_cmd.output()?;
     if !output.status.success() {
-        return Err(format!("command {:?} failed, {:?}",
-                           &abi_cmd, &output).into());
+        return Err(format!("command {:?} failed, {:?}", &abi_cmd, &output).into());
     }
 
-    let output = str::from_utf8(&output.stdout)?.trim();
-    if !output.starts_with("###gir test###") ||
-       !output.ends_with("###gir test###") {
-        return Err(format!("command {:?} return invalid output, {:?}",
-                           &abi_cmd, &output).into());
-    }
-
-    Ok(String::from(&output[14..(output.len() - 14)]))
+    Ok(String::from_utf8(output.stdout)?)
 }
 
 const RUST_LAYOUTS: &[(&str, Layout)] = &[
-    ("OstreeAsyncProgressClass", Layout {size: size_of::<OstreeAsyncProgressClass>(), alignment: align_of::<OstreeAsyncProgressClass>()}),
-    ("OstreeChecksumFlags", Layout {size: size_of::<OstreeChecksumFlags>(), alignment: align_of::<OstreeChecksumFlags>()}),
-    ("OstreeCollectionRef", Layout {size: size_of::<OstreeCollectionRef>(), alignment: align_of::<OstreeCollectionRef>()}),
-    ("OstreeCollectionRefv", Layout {size: size_of::<OstreeCollectionRefv>(), alignment: align_of::<OstreeCollectionRefv>()}),
-    ("OstreeCommitSizesEntry", Layout {size: size_of::<OstreeCommitSizesEntry>(), alignment: align_of::<OstreeCommitSizesEntry>()}),
-    ("OstreeContentWriterClass", Layout {size: size_of::<OstreeContentWriterClass>(), alignment: align_of::<OstreeContentWriterClass>()}),
-    ("OstreeDeploymentUnlockedState", Layout {size: size_of::<OstreeDeploymentUnlockedState>(), alignment: align_of::<OstreeDeploymentUnlockedState>()}),
-    ("OstreeDiffDirsOptions", Layout {size: size_of::<OstreeDiffDirsOptions>(), alignment: align_of::<OstreeDiffDirsOptions>()}),
-    ("OstreeDiffFlags", Layout {size: size_of::<OstreeDiffFlags>(), alignment: align_of::<OstreeDiffFlags>()}),
-    ("OstreeDiffItem", Layout {size: size_of::<OstreeDiffItem>(), alignment: align_of::<OstreeDiffItem>()}),
-    ("OstreeGpgError", Layout {size: size_of::<OstreeGpgError>(), alignment: align_of::<OstreeGpgError>()}),
-    ("OstreeGpgSignatureAttr", Layout {size: size_of::<OstreeGpgSignatureAttr>(), alignment: align_of::<OstreeGpgSignatureAttr>()}),
-    ("OstreeGpgSignatureFormatFlags", Layout {size: size_of::<OstreeGpgSignatureFormatFlags>(), alignment: align_of::<OstreeGpgSignatureFormatFlags>()}),
-    ("OstreeMutableTreeClass", Layout {size: size_of::<OstreeMutableTreeClass>(), alignment: align_of::<OstreeMutableTreeClass>()}),
-    ("OstreeMutableTreeIter", Layout {size: size_of::<OstreeMutableTreeIter>(), alignment: align_of::<OstreeMutableTreeIter>()}),
-    ("OstreeObjectType", Layout {size: size_of::<OstreeObjectType>(), alignment: align_of::<OstreeObjectType>()}),
-    ("OstreeRepoCheckoutAtOptions", Layout {size: size_of::<OstreeRepoCheckoutAtOptions>(), alignment: align_of::<OstreeRepoCheckoutAtOptions>()}),
-    ("OstreeRepoCheckoutFilterResult", Layout {size: size_of::<OstreeRepoCheckoutFilterResult>(), alignment: align_of::<OstreeRepoCheckoutFilterResult>()}),
-    ("OstreeRepoCheckoutMode", Layout {size: size_of::<OstreeRepoCheckoutMode>(), alignment: align_of::<OstreeRepoCheckoutMode>()}),
-    ("OstreeRepoCheckoutOverwriteMode", Layout {size: size_of::<OstreeRepoCheckoutOverwriteMode>(), alignment: align_of::<OstreeRepoCheckoutOverwriteMode>()}),
-    ("OstreeRepoCommitFilterResult", Layout {size: size_of::<OstreeRepoCommitFilterResult>(), alignment: align_of::<OstreeRepoCommitFilterResult>()}),
-    ("OstreeRepoCommitIterResult", Layout {size: size_of::<OstreeRepoCommitIterResult>(), alignment: align_of::<OstreeRepoCommitIterResult>()}),
-    ("OstreeRepoCommitModifierFlags", Layout {size: size_of::<OstreeRepoCommitModifierFlags>(), alignment: align_of::<OstreeRepoCommitModifierFlags>()}),
-    ("OstreeRepoCommitState", Layout {size: size_of::<OstreeRepoCommitState>(), alignment: align_of::<OstreeRepoCommitState>()}),
-    ("OstreeRepoCommitTraverseFlags", Layout {size: size_of::<OstreeRepoCommitTraverseFlags>(), alignment: align_of::<OstreeRepoCommitTraverseFlags>()}),
-    ("OstreeRepoCommitTraverseIter", Layout {size: size_of::<OstreeRepoCommitTraverseIter>(), alignment: align_of::<OstreeRepoCommitTraverseIter>()}),
-    ("OstreeRepoFileClass", Layout {size: size_of::<OstreeRepoFileClass>(), alignment: align_of::<OstreeRepoFileClass>()}),
-    ("OstreeRepoFinderAvahiClass", Layout {size: size_of::<OstreeRepoFinderAvahiClass>(), alignment: align_of::<OstreeRepoFinderAvahiClass>()}),
-    ("OstreeRepoFinderConfigClass", Layout {size: size_of::<OstreeRepoFinderConfigClass>(), alignment: align_of::<OstreeRepoFinderConfigClass>()}),
-    ("OstreeRepoFinderInterface", Layout {size: size_of::<OstreeRepoFinderInterface>(), alignment: align_of::<OstreeRepoFinderInterface>()}),
-    ("OstreeRepoFinderMountClass", Layout {size: size_of::<OstreeRepoFinderMountClass>(), alignment: align_of::<OstreeRepoFinderMountClass>()}),
-    ("OstreeRepoFinderOverrideClass", Layout {size: size_of::<OstreeRepoFinderOverrideClass>(), alignment: align_of::<OstreeRepoFinderOverrideClass>()}),
-    ("OstreeRepoFinderResult", Layout {size: size_of::<OstreeRepoFinderResult>(), alignment: align_of::<OstreeRepoFinderResult>()}),
-    ("OstreeRepoFinderResultv", Layout {size: size_of::<OstreeRepoFinderResultv>(), alignment: align_of::<OstreeRepoFinderResultv>()}),
-    ("OstreeRepoListObjectsFlags", Layout {size: size_of::<OstreeRepoListObjectsFlags>(), alignment: align_of::<OstreeRepoListObjectsFlags>()}),
-    ("OstreeRepoListRefsExtFlags", Layout {size: size_of::<OstreeRepoListRefsExtFlags>(), alignment: align_of::<OstreeRepoListRefsExtFlags>()}),
-    ("OstreeRepoMode", Layout {size: size_of::<OstreeRepoMode>(), alignment: align_of::<OstreeRepoMode>()}),
-    ("OstreeRepoPruneFlags", Layout {size: size_of::<OstreeRepoPruneFlags>(), alignment: align_of::<OstreeRepoPruneFlags>()}),
-    ("OstreeRepoPruneOptions", Layout {size: size_of::<OstreeRepoPruneOptions>(), alignment: align_of::<OstreeRepoPruneOptions>()}),
-    ("OstreeRepoPullFlags", Layout {size: size_of::<OstreeRepoPullFlags>(), alignment: align_of::<OstreeRepoPullFlags>()}),
-    ("OstreeRepoRemoteChange", Layout {size: size_of::<OstreeRepoRemoteChange>(), alignment: align_of::<OstreeRepoRemoteChange>()}),
-    ("OstreeRepoResolveRevExtFlags", Layout {size: size_of::<OstreeRepoResolveRevExtFlags>(), alignment: align_of::<OstreeRepoResolveRevExtFlags>()}),
-    ("OstreeRepoTransactionStats", Layout {size: size_of::<OstreeRepoTransactionStats>(), alignment: align_of::<OstreeRepoTransactionStats>()}),
-    ("OstreeSePolicyRestoreconFlags", Layout {size: size_of::<OstreeSePolicyRestoreconFlags>(), alignment: align_of::<OstreeSePolicyRestoreconFlags>()}),
-    ("OstreeSignInterface", Layout {size: size_of::<OstreeSignInterface>(), alignment: align_of::<OstreeSignInterface>()}),
-    ("OstreeStaticDeltaGenerateOpt", Layout {size: size_of::<OstreeStaticDeltaGenerateOpt>(), alignment: align_of::<OstreeStaticDeltaGenerateOpt>()}),
-    ("OstreeStaticDeltaIndexFlags", Layout {size: size_of::<OstreeStaticDeltaIndexFlags>(), alignment: align_of::<OstreeStaticDeltaIndexFlags>()}),
-    ("OstreeSysrootDeployTreeOpts", Layout {size: size_of::<OstreeSysrootDeployTreeOpts>(), alignment: align_of::<OstreeSysrootDeployTreeOpts>()}),
-    ("OstreeSysrootSimpleWriteDeploymentFlags", Layout {size: size_of::<OstreeSysrootSimpleWriteDeploymentFlags>(), alignment: align_of::<OstreeSysrootSimpleWriteDeploymentFlags>()}),
-    ("OstreeSysrootUpgraderFlags", Layout {size: size_of::<OstreeSysrootUpgraderFlags>(), alignment: align_of::<OstreeSysrootUpgraderFlags>()}),
-    ("OstreeSysrootUpgraderPullFlags", Layout {size: size_of::<OstreeSysrootUpgraderPullFlags>(), alignment: align_of::<OstreeSysrootUpgraderPullFlags>()}),
-    ("OstreeSysrootWriteDeploymentsOpts", Layout {size: size_of::<OstreeSysrootWriteDeploymentsOpts>(), alignment: align_of::<OstreeSysrootWriteDeploymentsOpts>()}),
+    (
+        "OstreeAsyncProgressClass",
+        Layout {
+            size: size_of::<OstreeAsyncProgressClass>(),
+            alignment: align_of::<OstreeAsyncProgressClass>(),
+        },
+    ),
+    (
+        "OstreeChecksumFlags",
+        Layout {
+            size: size_of::<OstreeChecksumFlags>(),
+            alignment: align_of::<OstreeChecksumFlags>(),
+        },
+    ),
+    (
+        "OstreeCollectionRef",
+        Layout {
+            size: size_of::<OstreeCollectionRef>(),
+            alignment: align_of::<OstreeCollectionRef>(),
+        },
+    ),
+    (
+        "OstreeCollectionRefv",
+        Layout {
+            size: size_of::<OstreeCollectionRefv>(),
+            alignment: align_of::<OstreeCollectionRefv>(),
+        },
+    ),
+    (
+        "OstreeCommitSizesEntry",
+        Layout {
+            size: size_of::<OstreeCommitSizesEntry>(),
+            alignment: align_of::<OstreeCommitSizesEntry>(),
+        },
+    ),
+    (
+        "OstreeContentWriterClass",
+        Layout {
+            size: size_of::<OstreeContentWriterClass>(),
+            alignment: align_of::<OstreeContentWriterClass>(),
+        },
+    ),
+    (
+        "OstreeDeploymentUnlockedState",
+        Layout {
+            size: size_of::<OstreeDeploymentUnlockedState>(),
+            alignment: align_of::<OstreeDeploymentUnlockedState>(),
+        },
+    ),
+    (
+        "OstreeDiffDirsOptions",
+        Layout {
+            size: size_of::<OstreeDiffDirsOptions>(),
+            alignment: align_of::<OstreeDiffDirsOptions>(),
+        },
+    ),
+    (
+        "OstreeDiffFlags",
+        Layout {
+            size: size_of::<OstreeDiffFlags>(),
+            alignment: align_of::<OstreeDiffFlags>(),
+        },
+    ),
+    (
+        "OstreeDiffItem",
+        Layout {
+            size: size_of::<OstreeDiffItem>(),
+            alignment: align_of::<OstreeDiffItem>(),
+        },
+    ),
+    (
+        "OstreeGpgError",
+        Layout {
+            size: size_of::<OstreeGpgError>(),
+            alignment: align_of::<OstreeGpgError>(),
+        },
+    ),
+    (
+        "OstreeGpgSignatureAttr",
+        Layout {
+            size: size_of::<OstreeGpgSignatureAttr>(),
+            alignment: align_of::<OstreeGpgSignatureAttr>(),
+        },
+    ),
+    (
+        "OstreeGpgSignatureFormatFlags",
+        Layout {
+            size: size_of::<OstreeGpgSignatureFormatFlags>(),
+            alignment: align_of::<OstreeGpgSignatureFormatFlags>(),
+        },
+    ),
+    (
+        "OstreeMutableTreeClass",
+        Layout {
+            size: size_of::<OstreeMutableTreeClass>(),
+            alignment: align_of::<OstreeMutableTreeClass>(),
+        },
+    ),
+    (
+        "OstreeMutableTreeIter",
+        Layout {
+            size: size_of::<OstreeMutableTreeIter>(),
+            alignment: align_of::<OstreeMutableTreeIter>(),
+        },
+    ),
+    (
+        "OstreeObjectType",
+        Layout {
+            size: size_of::<OstreeObjectType>(),
+            alignment: align_of::<OstreeObjectType>(),
+        },
+    ),
+    (
+        "OstreeRepoCheckoutAtOptions",
+        Layout {
+            size: size_of::<OstreeRepoCheckoutAtOptions>(),
+            alignment: align_of::<OstreeRepoCheckoutAtOptions>(),
+        },
+    ),
+    (
+        "OstreeRepoCheckoutFilterResult",
+        Layout {
+            size: size_of::<OstreeRepoCheckoutFilterResult>(),
+            alignment: align_of::<OstreeRepoCheckoutFilterResult>(),
+        },
+    ),
+    (
+        "OstreeRepoCheckoutMode",
+        Layout {
+            size: size_of::<OstreeRepoCheckoutMode>(),
+            alignment: align_of::<OstreeRepoCheckoutMode>(),
+        },
+    ),
+    (
+        "OstreeRepoCheckoutOverwriteMode",
+        Layout {
+            size: size_of::<OstreeRepoCheckoutOverwriteMode>(),
+            alignment: align_of::<OstreeRepoCheckoutOverwriteMode>(),
+        },
+    ),
+    (
+        "OstreeRepoCommitFilterResult",
+        Layout {
+            size: size_of::<OstreeRepoCommitFilterResult>(),
+            alignment: align_of::<OstreeRepoCommitFilterResult>(),
+        },
+    ),
+    (
+        "OstreeRepoCommitIterResult",
+        Layout {
+            size: size_of::<OstreeRepoCommitIterResult>(),
+            alignment: align_of::<OstreeRepoCommitIterResult>(),
+        },
+    ),
+    (
+        "OstreeRepoCommitModifierFlags",
+        Layout {
+            size: size_of::<OstreeRepoCommitModifierFlags>(),
+            alignment: align_of::<OstreeRepoCommitModifierFlags>(),
+        },
+    ),
+    (
+        "OstreeRepoCommitState",
+        Layout {
+            size: size_of::<OstreeRepoCommitState>(),
+            alignment: align_of::<OstreeRepoCommitState>(),
+        },
+    ),
+    (
+        "OstreeRepoCommitTraverseFlags",
+        Layout {
+            size: size_of::<OstreeRepoCommitTraverseFlags>(),
+            alignment: align_of::<OstreeRepoCommitTraverseFlags>(),
+        },
+    ),
+    (
+        "OstreeRepoCommitTraverseIter",
+        Layout {
+            size: size_of::<OstreeRepoCommitTraverseIter>(),
+            alignment: align_of::<OstreeRepoCommitTraverseIter>(),
+        },
+    ),
+    (
+        "OstreeRepoFileClass",
+        Layout {
+            size: size_of::<OstreeRepoFileClass>(),
+            alignment: align_of::<OstreeRepoFileClass>(),
+        },
+    ),
+    (
+        "OstreeRepoFinderAvahiClass",
+        Layout {
+            size: size_of::<OstreeRepoFinderAvahiClass>(),
+            alignment: align_of::<OstreeRepoFinderAvahiClass>(),
+        },
+    ),
+    (
+        "OstreeRepoFinderConfigClass",
+        Layout {
+            size: size_of::<OstreeRepoFinderConfigClass>(),
+            alignment: align_of::<OstreeRepoFinderConfigClass>(),
+        },
+    ),
+    (
+        "OstreeRepoFinderInterface",
+        Layout {
+            size: size_of::<OstreeRepoFinderInterface>(),
+            alignment: align_of::<OstreeRepoFinderInterface>(),
+        },
+    ),
+    (
+        "OstreeRepoFinderMountClass",
+        Layout {
+            size: size_of::<OstreeRepoFinderMountClass>(),
+            alignment: align_of::<OstreeRepoFinderMountClass>(),
+        },
+    ),
+    (
+        "OstreeRepoFinderOverrideClass",
+        Layout {
+            size: size_of::<OstreeRepoFinderOverrideClass>(),
+            alignment: align_of::<OstreeRepoFinderOverrideClass>(),
+        },
+    ),
+    (
+        "OstreeRepoFinderResult",
+        Layout {
+            size: size_of::<OstreeRepoFinderResult>(),
+            alignment: align_of::<OstreeRepoFinderResult>(),
+        },
+    ),
+    (
+        "OstreeRepoFinderResultv",
+        Layout {
+            size: size_of::<OstreeRepoFinderResultv>(),
+            alignment: align_of::<OstreeRepoFinderResultv>(),
+        },
+    ),
+    (
+        "OstreeRepoListObjectsFlags",
+        Layout {
+            size: size_of::<OstreeRepoListObjectsFlags>(),
+            alignment: align_of::<OstreeRepoListObjectsFlags>(),
+        },
+    ),
+    (
+        "OstreeRepoListRefsExtFlags",
+        Layout {
+            size: size_of::<OstreeRepoListRefsExtFlags>(),
+            alignment: align_of::<OstreeRepoListRefsExtFlags>(),
+        },
+    ),
+    (
+        "OstreeRepoMode",
+        Layout {
+            size: size_of::<OstreeRepoMode>(),
+            alignment: align_of::<OstreeRepoMode>(),
+        },
+    ),
+    (
+        "OstreeRepoPruneFlags",
+        Layout {
+            size: size_of::<OstreeRepoPruneFlags>(),
+            alignment: align_of::<OstreeRepoPruneFlags>(),
+        },
+    ),
+    (
+        "OstreeRepoPruneOptions",
+        Layout {
+            size: size_of::<OstreeRepoPruneOptions>(),
+            alignment: align_of::<OstreeRepoPruneOptions>(),
+        },
+    ),
+    (
+        "OstreeRepoPullFlags",
+        Layout {
+            size: size_of::<OstreeRepoPullFlags>(),
+            alignment: align_of::<OstreeRepoPullFlags>(),
+        },
+    ),
+    (
+        "OstreeRepoRemoteChange",
+        Layout {
+            size: size_of::<OstreeRepoRemoteChange>(),
+            alignment: align_of::<OstreeRepoRemoteChange>(),
+        },
+    ),
+    (
+        "OstreeRepoResolveRevExtFlags",
+        Layout {
+            size: size_of::<OstreeRepoResolveRevExtFlags>(),
+            alignment: align_of::<OstreeRepoResolveRevExtFlags>(),
+        },
+    ),
+    (
+        "OstreeRepoTransactionStats",
+        Layout {
+            size: size_of::<OstreeRepoTransactionStats>(),
+            alignment: align_of::<OstreeRepoTransactionStats>(),
+        },
+    ),
+    (
+        "OstreeSePolicyRestoreconFlags",
+        Layout {
+            size: size_of::<OstreeSePolicyRestoreconFlags>(),
+            alignment: align_of::<OstreeSePolicyRestoreconFlags>(),
+        },
+    ),
+    (
+        "OstreeSignInterface",
+        Layout {
+            size: size_of::<OstreeSignInterface>(),
+            alignment: align_of::<OstreeSignInterface>(),
+        },
+    ),
+    (
+        "OstreeStaticDeltaGenerateOpt",
+        Layout {
+            size: size_of::<OstreeStaticDeltaGenerateOpt>(),
+            alignment: align_of::<OstreeStaticDeltaGenerateOpt>(),
+        },
+    ),
+    (
+        "OstreeStaticDeltaIndexFlags",
+        Layout {
+            size: size_of::<OstreeStaticDeltaIndexFlags>(),
+            alignment: align_of::<OstreeStaticDeltaIndexFlags>(),
+        },
+    ),
+    (
+        "OstreeSysrootDeployTreeOpts",
+        Layout {
+            size: size_of::<OstreeSysrootDeployTreeOpts>(),
+            alignment: align_of::<OstreeSysrootDeployTreeOpts>(),
+        },
+    ),
+    (
+        "OstreeSysrootSimpleWriteDeploymentFlags",
+        Layout {
+            size: size_of::<OstreeSysrootSimpleWriteDeploymentFlags>(),
+            alignment: align_of::<OstreeSysrootSimpleWriteDeploymentFlags>(),
+        },
+    ),
+    (
+        "OstreeSysrootUpgraderFlags",
+        Layout {
+            size: size_of::<OstreeSysrootUpgraderFlags>(),
+            alignment: align_of::<OstreeSysrootUpgraderFlags>(),
+        },
+    ),
+    (
+        "OstreeSysrootUpgraderPullFlags",
+        Layout {
+            size: size_of::<OstreeSysrootUpgraderPullFlags>(),
+            alignment: align_of::<OstreeSysrootUpgraderPullFlags>(),
+        },
+    ),
+    (
+        "OstreeSysrootWriteDeploymentsOpts",
+        Layout {
+            size: size_of::<OstreeSysrootWriteDeploymentsOpts>(),
+            alignment: align_of::<OstreeSysrootWriteDeploymentsOpts>(),
+        },
+    ),
 ];
 
 const RUST_CONSTANTS: &[(&str, &str)] = &[
@@ -298,9 +581,15 @@ const RUST_CONSTANTS: &[(&str, &str)] = &[
     ("(guint) OSTREE_CHECKSUM_FLAGS_NONE", "0"),
     ("OSTREE_COMMIT_GVARIANT_STRING", "(a{sv}aya(say)sstayay)"),
     ("OSTREE_COMMIT_META_KEY_ARCHITECTURE", "ostree.architecture"),
-    ("OSTREE_COMMIT_META_KEY_COLLECTION_BINDING", "ostree.collection-binding"),
+    (
+        "OSTREE_COMMIT_META_KEY_COLLECTION_BINDING",
+        "ostree.collection-binding",
+    ),
     ("OSTREE_COMMIT_META_KEY_ENDOFLIFE", "ostree.endoflife"),
-    ("OSTREE_COMMIT_META_KEY_ENDOFLIFE_REBASE", "ostree.endoflife-rebase"),
+    (
+        "OSTREE_COMMIT_META_KEY_ENDOFLIFE_REBASE",
+        "ostree.endoflife-rebase",
+    ),
     ("OSTREE_COMMIT_META_KEY_REF_BINDING", "ostree.ref-binding"),
     ("OSTREE_COMMIT_META_KEY_SOURCE_TITLE", "ostree.source-title"),
     ("OSTREE_COMMIT_META_KEY_VERSION", "version"),
@@ -324,7 +613,10 @@ const RUST_CONSTANTS: &[(&str, &str)] = &[
     ("(gint) OSTREE_GPG_SIGNATURE_ATTR_HASH_ALGO_NAME", "9"),
     ("(gint) OSTREE_GPG_SIGNATURE_ATTR_KEY_EXPIRED", "2"),
     ("(gint) OSTREE_GPG_SIGNATURE_ATTR_KEY_EXP_TIMESTAMP", "13"),
-    ("(gint) OSTREE_GPG_SIGNATURE_ATTR_KEY_EXP_TIMESTAMP_PRIMARY", "14"),
+    (
+        "(gint) OSTREE_GPG_SIGNATURE_ATTR_KEY_EXP_TIMESTAMP_PRIMARY",
+        "14",
+    ),
     ("(gint) OSTREE_GPG_SIGNATURE_ATTR_KEY_MISSING", "4"),
     ("(gint) OSTREE_GPG_SIGNATURE_ATTR_KEY_REVOKED", "3"),
     ("(gint) OSTREE_GPG_SIGNATURE_ATTR_PUBKEY_ALGO_NAME", "8"),
@@ -338,7 +630,10 @@ const RUST_CONSTANTS: &[(&str, &str)] = &[
     ("OSTREE_MAX_METADATA_WARN_SIZE", "7340032"),
     ("OSTREE_METADATA_KEY_BOOTABLE", "ostree.bootable"),
     ("OSTREE_METADATA_KEY_LINUX", "ostree.linux"),
-    ("OSTREE_META_KEY_DEPLOY_COLLECTION_ID", "ostree.deploy-collection-id"),
+    (
+        "OSTREE_META_KEY_DEPLOY_COLLECTION_ID",
+        "ostree.deploy-collection-id",
+    ),
     ("(gint) OSTREE_OBJECT_TYPE_COMMIT", "4"),
     ("(gint) OSTREE_OBJECT_TYPE_COMMIT_META", "6"),
     ("(gint) OSTREE_OBJECT_TYPE_DIR_META", "3"),
@@ -361,11 +656,23 @@ const RUST_CONSTANTS: &[(&str, &str)] = &[
     ("(gint) OSTREE_REPO_COMMIT_ITER_RESULT_END", "1"),
     ("(gint) OSTREE_REPO_COMMIT_ITER_RESULT_ERROR", "0"),
     ("(gint) OSTREE_REPO_COMMIT_ITER_RESULT_FILE", "2"),
-    ("(guint) OSTREE_REPO_COMMIT_MODIFIER_FLAGS_CANONICAL_PERMISSIONS", "4"),
+    (
+        "(guint) OSTREE_REPO_COMMIT_MODIFIER_FLAGS_CANONICAL_PERMISSIONS",
+        "4",
+    ),
     ("(guint) OSTREE_REPO_COMMIT_MODIFIER_FLAGS_CONSUME", "16"),
-    ("(guint) OSTREE_REPO_COMMIT_MODIFIER_FLAGS_DEVINO_CANONICAL", "32"),
-    ("(guint) OSTREE_REPO_COMMIT_MODIFIER_FLAGS_ERROR_ON_UNLABELED", "8"),
-    ("(guint) OSTREE_REPO_COMMIT_MODIFIER_FLAGS_GENERATE_SIZES", "2"),
+    (
+        "(guint) OSTREE_REPO_COMMIT_MODIFIER_FLAGS_DEVINO_CANONICAL",
+        "32",
+    ),
+    (
+        "(guint) OSTREE_REPO_COMMIT_MODIFIER_FLAGS_ERROR_ON_UNLABELED",
+        "8",
+    ),
+    (
+        "(guint) OSTREE_REPO_COMMIT_MODIFIER_FLAGS_GENERATE_SIZES",
+        "2",
+    ),
     ("(guint) OSTREE_REPO_COMMIT_MODIFIER_FLAGS_NONE", "0"),
     ("(guint) OSTREE_REPO_COMMIT_MODIFIER_FLAGS_SKIP_XATTRS", "1"),
     ("(guint) OSTREE_REPO_COMMIT_STATE_FSCK_PARTIAL", "2"),
@@ -402,8 +709,14 @@ const RUST_CONSTANTS: &[(&str, &str)] = &[
     ("(gint) OSTREE_REPO_REMOTE_CHANGE_REPLACE", "4"),
     ("(guint) OSTREE_REPO_RESOLVE_REV_EXT_LOCAL_ONLY", "1"),
     ("(guint) OSTREE_REPO_RESOLVE_REV_EXT_NONE", "0"),
-    ("(guint) OSTREE_SEPOLICY_RESTORECON_FLAGS_ALLOW_NOLABEL", "1"),
-    ("(guint) OSTREE_SEPOLICY_RESTORECON_FLAGS_KEEP_EXISTING", "2"),
+    (
+        "(guint) OSTREE_SEPOLICY_RESTORECON_FLAGS_ALLOW_NOLABEL",
+        "1",
+    ),
+    (
+        "(guint) OSTREE_SEPOLICY_RESTORECON_FLAGS_KEEP_EXISTING",
+        "2",
+    ),
     ("(guint) OSTREE_SEPOLICY_RESTORECON_FLAGS_NONE", "0"),
     ("OSTREE_SHA256_DIGEST_LEN", "32"),
     ("OSTREE_SHA256_STRING_LEN", "64"),
@@ -413,18 +726,40 @@ const RUST_CONSTANTS: &[(&str, &str)] = &[
     ("(gint) OSTREE_STATIC_DELTA_INDEX_FLAGS_NONE", "0"),
     ("OSTREE_SUMMARY_GVARIANT_STRING", "(a(s(taya{sv}))a{sv})"),
     ("OSTREE_SUMMARY_SIG_GVARIANT_STRING", "a{sv}"),
-    ("(guint) OSTREE_SYSROOT_SIMPLE_WRITE_DEPLOYMENT_FLAGS_NONE", "0"),
-    ("(guint) OSTREE_SYSROOT_SIMPLE_WRITE_DEPLOYMENT_FLAGS_NOT_DEFAULT", "2"),
-    ("(guint) OSTREE_SYSROOT_SIMPLE_WRITE_DEPLOYMENT_FLAGS_NO_CLEAN", "4"),
-    ("(guint) OSTREE_SYSROOT_SIMPLE_WRITE_DEPLOYMENT_FLAGS_RETAIN", "1"),
-    ("(guint) OSTREE_SYSROOT_SIMPLE_WRITE_DEPLOYMENT_FLAGS_RETAIN_PENDING", "8"),
-    ("(guint) OSTREE_SYSROOT_SIMPLE_WRITE_DEPLOYMENT_FLAGS_RETAIN_ROLLBACK", "16"),
-    ("(guint) OSTREE_SYSROOT_UPGRADER_FLAGS_IGNORE_UNCONFIGURED", "2"),
-    ("(guint) OSTREE_SYSROOT_UPGRADER_PULL_FLAGS_ALLOW_OLDER", "1"),
+    (
+        "(guint) OSTREE_SYSROOT_SIMPLE_WRITE_DEPLOYMENT_FLAGS_NONE",
+        "0",
+    ),
+    (
+        "(guint) OSTREE_SYSROOT_SIMPLE_WRITE_DEPLOYMENT_FLAGS_NOT_DEFAULT",
+        "2",
+    ),
+    (
+        "(guint) OSTREE_SYSROOT_SIMPLE_WRITE_DEPLOYMENT_FLAGS_NO_CLEAN",
+        "4",
+    ),
+    (
+        "(guint) OSTREE_SYSROOT_SIMPLE_WRITE_DEPLOYMENT_FLAGS_RETAIN",
+        "1",
+    ),
+    (
+        "(guint) OSTREE_SYSROOT_SIMPLE_WRITE_DEPLOYMENT_FLAGS_RETAIN_PENDING",
+        "8",
+    ),
+    (
+        "(guint) OSTREE_SYSROOT_SIMPLE_WRITE_DEPLOYMENT_FLAGS_RETAIN_ROLLBACK",
+        "16",
+    ),
+    (
+        "(guint) OSTREE_SYSROOT_UPGRADER_FLAGS_IGNORE_UNCONFIGURED",
+        "2",
+    ),
+    (
+        "(guint) OSTREE_SYSROOT_UPGRADER_PULL_FLAGS_ALLOW_OLDER",
+        "1",
+    ),
     ("(guint) OSTREE_SYSROOT_UPGRADER_PULL_FLAGS_NONE", "0"),
     ("(guint) OSTREE_SYSROOT_UPGRADER_PULL_FLAGS_SYNTHETIC", "2"),
     ("OSTREE_TIMESTAMP", "0"),
     ("OSTREE_TREE_GVARIANT_STRING", "(a(say)a(sayay))"),
 ];
-
-
index 9836428702b17a217371a5d37662b514a7ef4880..8ec21a8e44045cddb3b90ece76aee7a117320361 100644 (file)
 // This file was generated by gir (https://github.com/gtk-rs/gir)
-// from gir-files (https://github.com/gtk-rs/gir-files)
+// from gir-files
 // DO NOT EDIT
 
 #include "manual.h"
 #include <stdio.h>
 
+#define PRINT_CONSTANT(CONSTANT_NAME) \
+    printf("%s;", #CONSTANT_NAME); \
+    printf(_Generic((CONSTANT_NAME), \
+                    char *: "%s", \
+                    const char *: "%s", \
+                    char: "%c", \
+                    signed char: "%hhd", \
+                    unsigned char: "%hhu", \
+                    short int: "%hd", \
+                    unsigned short int: "%hu", \
+                    int: "%d", \
+                    unsigned int: "%u", \
+                    long: "%ld", \
+                    unsigned long: "%lu", \
+                    long long: "%lld", \
+                    unsigned long long: "%llu", \
+                    float: "%f", \
+                    double: "%f", \
+                    long double: "%ld"), \
+           CONSTANT_NAME); \
+    printf("\n");
+
 int main() {
-    printf(_Generic((ABI_CONSTANT_NAME),
-                    char *: "###gir test###%s###gir test###\n",
-                    const char *: "###gir test###%s###gir test###\n",
-                    char: "###gir test###%c###gir test###\n",
-                    signed char: "###gir test###%hhd###gir test###\n",
-                    unsigned char: "###gir test###%hhu###gir test###\n",
-                    short int: "###gir test###%hd###gir test###\n",
-                    unsigned short int: "###gir test###%hu###gir test###\n",
-                    int: "###gir test###%d###gir test###\n",
-                    unsigned int: "###gir test###%u###gir test###\n",
-                    long: "###gir test###%ld###gir test###\n",
-                    unsigned long: "###gir test###%lu###gir test###\n",
-                    long long: "###gir test###%lld###gir test###\n",
-                    unsigned long long: "###gir test###%llu###gir test###\n",
-                    double: "###gir test###%f###gir test###\n",
-                    long double: "###gir test###%ld###gir test###\n"),
-           ABI_CONSTANT_NAME);
+    PRINT_CONSTANT((guint) OSTREE_CHECKSUM_FLAGS_IGNORE_XATTRS);
+    PRINT_CONSTANT((guint) OSTREE_CHECKSUM_FLAGS_NONE);
+    PRINT_CONSTANT(OSTREE_COMMIT_GVARIANT_STRING);
+    PRINT_CONSTANT(OSTREE_COMMIT_META_KEY_ARCHITECTURE);
+    PRINT_CONSTANT(OSTREE_COMMIT_META_KEY_COLLECTION_BINDING);
+    PRINT_CONSTANT(OSTREE_COMMIT_META_KEY_ENDOFLIFE);
+    PRINT_CONSTANT(OSTREE_COMMIT_META_KEY_ENDOFLIFE_REBASE);
+    PRINT_CONSTANT(OSTREE_COMMIT_META_KEY_REF_BINDING);
+    PRINT_CONSTANT(OSTREE_COMMIT_META_KEY_SOURCE_TITLE);
+    PRINT_CONSTANT(OSTREE_COMMIT_META_KEY_VERSION);
+    PRINT_CONSTANT((gint) OSTREE_DEPLOYMENT_UNLOCKED_DEVELOPMENT);
+    PRINT_CONSTANT((gint) OSTREE_DEPLOYMENT_UNLOCKED_HOTFIX);
+    PRINT_CONSTANT((gint) OSTREE_DEPLOYMENT_UNLOCKED_NONE);
+    PRINT_CONSTANT((gint) OSTREE_DEPLOYMENT_UNLOCKED_TRANSIENT);
+    PRINT_CONSTANT((guint) OSTREE_DIFF_FLAGS_IGNORE_XATTRS);
+    PRINT_CONSTANT((guint) OSTREE_DIFF_FLAGS_NONE);
+    PRINT_CONSTANT(OSTREE_DIRMETA_GVARIANT_STRING);
+    PRINT_CONSTANT(OSTREE_FILEMETA_GVARIANT_STRING);
+    PRINT_CONSTANT((gint) OSTREE_GPG_ERROR_EXPIRED_KEY);
+    PRINT_CONSTANT((gint) OSTREE_GPG_ERROR_EXPIRED_SIGNATURE);
+    PRINT_CONSTANT((gint) OSTREE_GPG_ERROR_INVALID_SIGNATURE);
+    PRINT_CONSTANT((gint) OSTREE_GPG_ERROR_MISSING_KEY);
+    PRINT_CONSTANT((gint) OSTREE_GPG_ERROR_NO_SIGNATURE);
+    PRINT_CONSTANT((gint) OSTREE_GPG_ERROR_REVOKED_KEY);
+    PRINT_CONSTANT((gint) OSTREE_GPG_SIGNATURE_ATTR_EXP_TIMESTAMP);
+    PRINT_CONSTANT((gint) OSTREE_GPG_SIGNATURE_ATTR_FINGERPRINT);
+    PRINT_CONSTANT((gint) OSTREE_GPG_SIGNATURE_ATTR_FINGERPRINT_PRIMARY);
+    PRINT_CONSTANT((gint) OSTREE_GPG_SIGNATURE_ATTR_HASH_ALGO_NAME);
+    PRINT_CONSTANT((gint) OSTREE_GPG_SIGNATURE_ATTR_KEY_EXPIRED);
+    PRINT_CONSTANT((gint) OSTREE_GPG_SIGNATURE_ATTR_KEY_EXP_TIMESTAMP);
+    PRINT_CONSTANT((gint) OSTREE_GPG_SIGNATURE_ATTR_KEY_EXP_TIMESTAMP_PRIMARY);
+    PRINT_CONSTANT((gint) OSTREE_GPG_SIGNATURE_ATTR_KEY_MISSING);
+    PRINT_CONSTANT((gint) OSTREE_GPG_SIGNATURE_ATTR_KEY_REVOKED);
+    PRINT_CONSTANT((gint) OSTREE_GPG_SIGNATURE_ATTR_PUBKEY_ALGO_NAME);
+    PRINT_CONSTANT((gint) OSTREE_GPG_SIGNATURE_ATTR_SIG_EXPIRED);
+    PRINT_CONSTANT((gint) OSTREE_GPG_SIGNATURE_ATTR_TIMESTAMP);
+    PRINT_CONSTANT((gint) OSTREE_GPG_SIGNATURE_ATTR_USER_EMAIL);
+    PRINT_CONSTANT((gint) OSTREE_GPG_SIGNATURE_ATTR_USER_NAME);
+    PRINT_CONSTANT((gint) OSTREE_GPG_SIGNATURE_ATTR_VALID);
+    PRINT_CONSTANT((guint) OSTREE_GPG_SIGNATURE_FORMAT_DEFAULT);
+    PRINT_CONSTANT(OSTREE_MAX_METADATA_SIZE);
+    PRINT_CONSTANT(OSTREE_MAX_METADATA_WARN_SIZE);
+    PRINT_CONSTANT(OSTREE_METADATA_KEY_BOOTABLE);
+    PRINT_CONSTANT(OSTREE_METADATA_KEY_LINUX);
+    PRINT_CONSTANT(OSTREE_META_KEY_DEPLOY_COLLECTION_ID);
+    PRINT_CONSTANT((gint) OSTREE_OBJECT_TYPE_COMMIT);
+    PRINT_CONSTANT((gint) OSTREE_OBJECT_TYPE_COMMIT_META);
+    PRINT_CONSTANT((gint) OSTREE_OBJECT_TYPE_DIR_META);
+    PRINT_CONSTANT((gint) OSTREE_OBJECT_TYPE_DIR_TREE);
+    PRINT_CONSTANT((gint) OSTREE_OBJECT_TYPE_FILE);
+    PRINT_CONSTANT((gint) OSTREE_OBJECT_TYPE_PAYLOAD_LINK);
+    PRINT_CONSTANT((gint) OSTREE_OBJECT_TYPE_TOMBSTONE_COMMIT);
+    PRINT_CONSTANT(OSTREE_ORIGIN_TRANSIENT_GROUP);
+    PRINT_CONSTANT((gint) OSTREE_REPO_CHECKOUT_FILTER_ALLOW);
+    PRINT_CONSTANT((gint) OSTREE_REPO_CHECKOUT_FILTER_SKIP);
+    PRINT_CONSTANT((gint) OSTREE_REPO_CHECKOUT_MODE_NONE);
+    PRINT_CONSTANT((gint) OSTREE_REPO_CHECKOUT_MODE_USER);
+    PRINT_CONSTANT((gint) OSTREE_REPO_CHECKOUT_OVERWRITE_ADD_FILES);
+    PRINT_CONSTANT((gint) OSTREE_REPO_CHECKOUT_OVERWRITE_NONE);
+    PRINT_CONSTANT((gint) OSTREE_REPO_CHECKOUT_OVERWRITE_UNION_FILES);
+    PRINT_CONSTANT((gint) OSTREE_REPO_CHECKOUT_OVERWRITE_UNION_IDENTICAL);
+    PRINT_CONSTANT((gint) OSTREE_REPO_COMMIT_FILTER_ALLOW);
+    PRINT_CONSTANT((gint) OSTREE_REPO_COMMIT_FILTER_SKIP);
+    PRINT_CONSTANT((gint) OSTREE_REPO_COMMIT_ITER_RESULT_DIR);
+    PRINT_CONSTANT((gint) OSTREE_REPO_COMMIT_ITER_RESULT_END);
+    PRINT_CONSTANT((gint) OSTREE_REPO_COMMIT_ITER_RESULT_ERROR);
+    PRINT_CONSTANT((gint) OSTREE_REPO_COMMIT_ITER_RESULT_FILE);
+    PRINT_CONSTANT((guint) OSTREE_REPO_COMMIT_MODIFIER_FLAGS_CANONICAL_PERMISSIONS);
+    PRINT_CONSTANT((guint) OSTREE_REPO_COMMIT_MODIFIER_FLAGS_CONSUME);
+    PRINT_CONSTANT((guint) OSTREE_REPO_COMMIT_MODIFIER_FLAGS_DEVINO_CANONICAL);
+    PRINT_CONSTANT((guint) OSTREE_REPO_COMMIT_MODIFIER_FLAGS_ERROR_ON_UNLABELED);
+    PRINT_CONSTANT((guint) OSTREE_REPO_COMMIT_MODIFIER_FLAGS_GENERATE_SIZES);
+    PRINT_CONSTANT((guint) OSTREE_REPO_COMMIT_MODIFIER_FLAGS_NONE);
+    PRINT_CONSTANT((guint) OSTREE_REPO_COMMIT_MODIFIER_FLAGS_SKIP_XATTRS);
+    PRINT_CONSTANT((guint) OSTREE_REPO_COMMIT_STATE_FSCK_PARTIAL);
+    PRINT_CONSTANT((guint) OSTREE_REPO_COMMIT_STATE_NORMAL);
+    PRINT_CONSTANT((guint) OSTREE_REPO_COMMIT_STATE_PARTIAL);
+    PRINT_CONSTANT((guint) OSTREE_REPO_COMMIT_TRAVERSE_FLAG_NONE);
+    PRINT_CONSTANT((guint) OSTREE_REPO_LIST_OBJECTS_ALL);
+    PRINT_CONSTANT((guint) OSTREE_REPO_LIST_OBJECTS_LOOSE);
+    PRINT_CONSTANT((guint) OSTREE_REPO_LIST_OBJECTS_NO_PARENTS);
+    PRINT_CONSTANT((guint) OSTREE_REPO_LIST_OBJECTS_PACKED);
+    PRINT_CONSTANT((guint) OSTREE_REPO_LIST_REFS_EXT_ALIASES);
+    PRINT_CONSTANT((guint) OSTREE_REPO_LIST_REFS_EXT_EXCLUDE_MIRRORS);
+    PRINT_CONSTANT((guint) OSTREE_REPO_LIST_REFS_EXT_EXCLUDE_REMOTES);
+    PRINT_CONSTANT((guint) OSTREE_REPO_LIST_REFS_EXT_NONE);
+    PRINT_CONSTANT(OSTREE_REPO_METADATA_REF);
+    PRINT_CONSTANT((gint) OSTREE_REPO_MODE_ARCHIVE);
+    PRINT_CONSTANT((gint) OSTREE_REPO_MODE_ARCHIVE_Z2);
+    PRINT_CONSTANT((gint) OSTREE_REPO_MODE_BARE);
+    PRINT_CONSTANT((gint) OSTREE_REPO_MODE_BARE_USER);
+    PRINT_CONSTANT((gint) OSTREE_REPO_MODE_BARE_USER_ONLY);
+    PRINT_CONSTANT((guint) OSTREE_REPO_PRUNE_FLAGS_NONE);
+    PRINT_CONSTANT((guint) OSTREE_REPO_PRUNE_FLAGS_NO_PRUNE);
+    PRINT_CONSTANT((guint) OSTREE_REPO_PRUNE_FLAGS_REFS_ONLY);
+    PRINT_CONSTANT((guint) OSTREE_REPO_PULL_FLAGS_BAREUSERONLY_FILES);
+    PRINT_CONSTANT((guint) OSTREE_REPO_PULL_FLAGS_COMMIT_ONLY);
+    PRINT_CONSTANT((guint) OSTREE_REPO_PULL_FLAGS_MIRROR);
+    PRINT_CONSTANT((guint) OSTREE_REPO_PULL_FLAGS_NONE);
+    PRINT_CONSTANT((guint) OSTREE_REPO_PULL_FLAGS_TRUSTED_HTTP);
+    PRINT_CONSTANT((guint) OSTREE_REPO_PULL_FLAGS_UNTRUSTED);
+    PRINT_CONSTANT((gint) OSTREE_REPO_REMOTE_CHANGE_ADD);
+    PRINT_CONSTANT((gint) OSTREE_REPO_REMOTE_CHANGE_ADD_IF_NOT_EXISTS);
+    PRINT_CONSTANT((gint) OSTREE_REPO_REMOTE_CHANGE_DELETE);
+    PRINT_CONSTANT((gint) OSTREE_REPO_REMOTE_CHANGE_DELETE_IF_EXISTS);
+    PRINT_CONSTANT((gint) OSTREE_REPO_REMOTE_CHANGE_REPLACE);
+    PRINT_CONSTANT((guint) OSTREE_REPO_RESOLVE_REV_EXT_LOCAL_ONLY);
+    PRINT_CONSTANT((guint) OSTREE_REPO_RESOLVE_REV_EXT_NONE);
+    PRINT_CONSTANT((guint) OSTREE_SEPOLICY_RESTORECON_FLAGS_ALLOW_NOLABEL);
+    PRINT_CONSTANT((guint) OSTREE_SEPOLICY_RESTORECON_FLAGS_KEEP_EXISTING);
+    PRINT_CONSTANT((guint) OSTREE_SEPOLICY_RESTORECON_FLAGS_NONE);
+    PRINT_CONSTANT(OSTREE_SHA256_DIGEST_LEN);
+    PRINT_CONSTANT(OSTREE_SHA256_STRING_LEN);
+    PRINT_CONSTANT(OSTREE_SIGN_NAME_ED25519);
+    PRINT_CONSTANT((gint) OSTREE_STATIC_DELTA_GENERATE_OPT_LOWLATENCY);
+    PRINT_CONSTANT((gint) OSTREE_STATIC_DELTA_GENERATE_OPT_MAJOR);
+    PRINT_CONSTANT((gint) OSTREE_STATIC_DELTA_INDEX_FLAGS_NONE);
+    PRINT_CONSTANT(OSTREE_SUMMARY_GVARIANT_STRING);
+    PRINT_CONSTANT(OSTREE_SUMMARY_SIG_GVARIANT_STRING);
+    PRINT_CONSTANT((guint) OSTREE_SYSROOT_SIMPLE_WRITE_DEPLOYMENT_FLAGS_NONE);
+    PRINT_CONSTANT((guint) OSTREE_SYSROOT_SIMPLE_WRITE_DEPLOYMENT_FLAGS_NOT_DEFAULT);
+    PRINT_CONSTANT((guint) OSTREE_SYSROOT_SIMPLE_WRITE_DEPLOYMENT_FLAGS_NO_CLEAN);
+    PRINT_CONSTANT((guint) OSTREE_SYSROOT_SIMPLE_WRITE_DEPLOYMENT_FLAGS_RETAIN);
+    PRINT_CONSTANT((guint) OSTREE_SYSROOT_SIMPLE_WRITE_DEPLOYMENT_FLAGS_RETAIN_PENDING);
+    PRINT_CONSTANT((guint) OSTREE_SYSROOT_SIMPLE_WRITE_DEPLOYMENT_FLAGS_RETAIN_ROLLBACK);
+    PRINT_CONSTANT((guint) OSTREE_SYSROOT_UPGRADER_FLAGS_IGNORE_UNCONFIGURED);
+    PRINT_CONSTANT((guint) OSTREE_SYSROOT_UPGRADER_PULL_FLAGS_ALLOW_OLDER);
+    PRINT_CONSTANT((guint) OSTREE_SYSROOT_UPGRADER_PULL_FLAGS_NONE);
+    PRINT_CONSTANT((guint) OSTREE_SYSROOT_UPGRADER_PULL_FLAGS_SYNTHETIC);
+    PRINT_CONSTANT(OSTREE_TIMESTAMP);
+    PRINT_CONSTANT(OSTREE_TREE_GVARIANT_STRING);
     return 0;
 }
index 45f2ef46113ee317b1d9bb2f59f4db36ff9aba9d..bfc385d3951b22c727eda548a6a484774baeb4d3 100644 (file)
@@ -1,5 +1,5 @@
 // This file was generated by gir (https://github.com/gtk-rs/gir)
-// from gir-files (https://github.com/gtk-rs/gir-files)
+// from gir-files
 // DO NOT EDIT
 
 #include "manual.h"
@@ -7,6 +7,57 @@
 #include <stdio.h>
 
 int main() {
-    printf("%zu\n%zu", sizeof(ABI_TYPE_NAME), alignof(ABI_TYPE_NAME));
+    printf("%s;%zu;%zu\n", "OstreeAsyncProgressClass", sizeof(OstreeAsyncProgressClass), alignof(OstreeAsyncProgressClass));
+    printf("%s;%zu;%zu\n", "OstreeChecksumFlags", sizeof(OstreeChecksumFlags), alignof(OstreeChecksumFlags));
+    printf("%s;%zu;%zu\n", "OstreeCollectionRef", sizeof(OstreeCollectionRef), alignof(OstreeCollectionRef));
+    printf("%s;%zu;%zu\n", "OstreeCollectionRefv", sizeof(OstreeCollectionRefv), alignof(OstreeCollectionRefv));
+    printf("%s;%zu;%zu\n", "OstreeCommitSizesEntry", sizeof(OstreeCommitSizesEntry), alignof(OstreeCommitSizesEntry));
+    printf("%s;%zu;%zu\n", "OstreeContentWriterClass", sizeof(OstreeContentWriterClass), alignof(OstreeContentWriterClass));
+    printf("%s;%zu;%zu\n", "OstreeDeploymentUnlockedState", sizeof(OstreeDeploymentUnlockedState), alignof(OstreeDeploymentUnlockedState));
+    printf("%s;%zu;%zu\n", "OstreeDiffDirsOptions", sizeof(OstreeDiffDirsOptions), alignof(OstreeDiffDirsOptions));
+    printf("%s;%zu;%zu\n", "OstreeDiffFlags", sizeof(OstreeDiffFlags), alignof(OstreeDiffFlags));
+    printf("%s;%zu;%zu\n", "OstreeDiffItem", sizeof(OstreeDiffItem), alignof(OstreeDiffItem));
+    printf("%s;%zu;%zu\n", "OstreeGpgError", sizeof(OstreeGpgError), alignof(OstreeGpgError));
+    printf("%s;%zu;%zu\n", "OstreeGpgSignatureAttr", sizeof(OstreeGpgSignatureAttr), alignof(OstreeGpgSignatureAttr));
+    printf("%s;%zu;%zu\n", "OstreeGpgSignatureFormatFlags", sizeof(OstreeGpgSignatureFormatFlags), alignof(OstreeGpgSignatureFormatFlags));
+    printf("%s;%zu;%zu\n", "OstreeMutableTreeClass", sizeof(OstreeMutableTreeClass), alignof(OstreeMutableTreeClass));
+    printf("%s;%zu;%zu\n", "OstreeMutableTreeIter", sizeof(OstreeMutableTreeIter), alignof(OstreeMutableTreeIter));
+    printf("%s;%zu;%zu\n", "OstreeObjectType", sizeof(OstreeObjectType), alignof(OstreeObjectType));
+    printf("%s;%zu;%zu\n", "OstreeRepoCheckoutAtOptions", sizeof(OstreeRepoCheckoutAtOptions), alignof(OstreeRepoCheckoutAtOptions));
+    printf("%s;%zu;%zu\n", "OstreeRepoCheckoutFilterResult", sizeof(OstreeRepoCheckoutFilterResult), alignof(OstreeRepoCheckoutFilterResult));
+    printf("%s;%zu;%zu\n", "OstreeRepoCheckoutMode", sizeof(OstreeRepoCheckoutMode), alignof(OstreeRepoCheckoutMode));
+    printf("%s;%zu;%zu\n", "OstreeRepoCheckoutOverwriteMode", sizeof(OstreeRepoCheckoutOverwriteMode), alignof(OstreeRepoCheckoutOverwriteMode));
+    printf("%s;%zu;%zu\n", "OstreeRepoCommitFilterResult", sizeof(OstreeRepoCommitFilterResult), alignof(OstreeRepoCommitFilterResult));
+    printf("%s;%zu;%zu\n", "OstreeRepoCommitIterResult", sizeof(OstreeRepoCommitIterResult), alignof(OstreeRepoCommitIterResult));
+    printf("%s;%zu;%zu\n", "OstreeRepoCommitModifierFlags", sizeof(OstreeRepoCommitModifierFlags), alignof(OstreeRepoCommitModifierFlags));
+    printf("%s;%zu;%zu\n", "OstreeRepoCommitState", sizeof(OstreeRepoCommitState), alignof(OstreeRepoCommitState));
+    printf("%s;%zu;%zu\n", "OstreeRepoCommitTraverseFlags", sizeof(OstreeRepoCommitTraverseFlags), alignof(OstreeRepoCommitTraverseFlags));
+    printf("%s;%zu;%zu\n", "OstreeRepoCommitTraverseIter", sizeof(OstreeRepoCommitTraverseIter), alignof(OstreeRepoCommitTraverseIter));
+    printf("%s;%zu;%zu\n", "OstreeRepoFileClass", sizeof(OstreeRepoFileClass), alignof(OstreeRepoFileClass));
+    printf("%s;%zu;%zu\n", "OstreeRepoFinderAvahiClass", sizeof(OstreeRepoFinderAvahiClass), alignof(OstreeRepoFinderAvahiClass));
+    printf("%s;%zu;%zu\n", "OstreeRepoFinderConfigClass", sizeof(OstreeRepoFinderConfigClass), alignof(OstreeRepoFinderConfigClass));
+    printf("%s;%zu;%zu\n", "OstreeRepoFinderInterface", sizeof(OstreeRepoFinderInterface), alignof(OstreeRepoFinderInterface));
+    printf("%s;%zu;%zu\n", "OstreeRepoFinderMountClass", sizeof(OstreeRepoFinderMountClass), alignof(OstreeRepoFinderMountClass));
+    printf("%s;%zu;%zu\n", "OstreeRepoFinderOverrideClass", sizeof(OstreeRepoFinderOverrideClass), alignof(OstreeRepoFinderOverrideClass));
+    printf("%s;%zu;%zu\n", "OstreeRepoFinderResult", sizeof(OstreeRepoFinderResult), alignof(OstreeRepoFinderResult));
+    printf("%s;%zu;%zu\n", "OstreeRepoFinderResultv", sizeof(OstreeRepoFinderResultv), alignof(OstreeRepoFinderResultv));
+    printf("%s;%zu;%zu\n", "OstreeRepoListObjectsFlags", sizeof(OstreeRepoListObjectsFlags), alignof(OstreeRepoListObjectsFlags));
+    printf("%s;%zu;%zu\n", "OstreeRepoListRefsExtFlags", sizeof(OstreeRepoListRefsExtFlags), alignof(OstreeRepoListRefsExtFlags));
+    printf("%s;%zu;%zu\n", "OstreeRepoMode", sizeof(OstreeRepoMode), alignof(OstreeRepoMode));
+    printf("%s;%zu;%zu\n", "OstreeRepoPruneFlags", sizeof(OstreeRepoPruneFlags), alignof(OstreeRepoPruneFlags));
+    printf("%s;%zu;%zu\n", "OstreeRepoPruneOptions", sizeof(OstreeRepoPruneOptions), alignof(OstreeRepoPruneOptions));
+    printf("%s;%zu;%zu\n", "OstreeRepoPullFlags", sizeof(OstreeRepoPullFlags), alignof(OstreeRepoPullFlags));
+    printf("%s;%zu;%zu\n", "OstreeRepoRemoteChange", sizeof(OstreeRepoRemoteChange), alignof(OstreeRepoRemoteChange));
+    printf("%s;%zu;%zu\n", "OstreeRepoResolveRevExtFlags", sizeof(OstreeRepoResolveRevExtFlags), alignof(OstreeRepoResolveRevExtFlags));
+    printf("%s;%zu;%zu\n", "OstreeRepoTransactionStats", sizeof(OstreeRepoTransactionStats), alignof(OstreeRepoTransactionStats));
+    printf("%s;%zu;%zu\n", "OstreeSePolicyRestoreconFlags", sizeof(OstreeSePolicyRestoreconFlags), alignof(OstreeSePolicyRestoreconFlags));
+    printf("%s;%zu;%zu\n", "OstreeSignInterface", sizeof(OstreeSignInterface), alignof(OstreeSignInterface));
+    printf("%s;%zu;%zu\n", "OstreeStaticDeltaGenerateOpt", sizeof(OstreeStaticDeltaGenerateOpt), alignof(OstreeStaticDeltaGenerateOpt));
+    printf("%s;%zu;%zu\n", "OstreeStaticDeltaIndexFlags", sizeof(OstreeStaticDeltaIndexFlags), alignof(OstreeStaticDeltaIndexFlags));
+    printf("%s;%zu;%zu\n", "OstreeSysrootDeployTreeOpts", sizeof(OstreeSysrootDeployTreeOpts), alignof(OstreeSysrootDeployTreeOpts));
+    printf("%s;%zu;%zu\n", "OstreeSysrootSimpleWriteDeploymentFlags", sizeof(OstreeSysrootSimpleWriteDeploymentFlags), alignof(OstreeSysrootSimpleWriteDeploymentFlags));
+    printf("%s;%zu;%zu\n", "OstreeSysrootUpgraderFlags", sizeof(OstreeSysrootUpgraderFlags), alignof(OstreeSysrootUpgraderFlags));
+    printf("%s;%zu;%zu\n", "OstreeSysrootUpgraderPullFlags", sizeof(OstreeSysrootUpgraderPullFlags), alignof(OstreeSysrootUpgraderPullFlags));
+    printf("%s;%zu;%zu\n", "OstreeSysrootWriteDeploymentsOpts", sizeof(OstreeSysrootWriteDeploymentsOpts), alignof(OstreeSysrootWriteDeploymentsOpts));
     return 0;
 }
index 465418b8e95bd1bd1abb935fd14c8eaaea8f6e63..15908731f1c78e3bfba870f1fbdbcf51fcba7aea 100644 (file)
@@ -1,6 +1,6 @@
+use crate::util::TestRepo;
 use gio::NONE_CANCELLABLE;
 use ostree::{checksum_file_from_input, ObjectType};
-use util::TestRepo;
 
 #[test]
 fn should_checksum_file_from_input() {
index dc77607b1835dc2921565e467111a77b8df4eb89..ab23032c0542b49a91b5c826591512c06b017a82 100644 (file)
@@ -32,7 +32,7 @@ fn should_traverse_commit() {
         .expect("traverse commit");
 
     assert_eq!(
-        hashset!(
+        maplit::hashset!(
             ObjectName::new(
                 "89f84ca9854a80e85b583e46a115ba4985254437027bad34f0b113219323d3f8",
                 ObjectType::File
@@ -76,7 +76,7 @@ fn should_checkout_tree() {
         .checkout_tree(
             ostree::RepoCheckoutMode::User,
             ostree::RepoCheckoutOverwriteMode::None,
-            &gio::File::new_for_path(checkout_dir.path().join("test-checkout")),
+            &gio::File::for_path(checkout_dir.path().join("test-checkout")),
             &file,
             &info,
             NONE_CANCELLABLE,
index 589c05b53c9e2eb050099832d7fb4661c1ace540..9510133c4221f7f16551423419bd1bbce65e9af8 100644 (file)
@@ -1,11 +1,3 @@
-extern crate gio;
-extern crate glib;
-extern crate openat;
-extern crate ostree;
-extern crate tempfile;
-#[macro_use]
-extern crate maplit;
-
 mod functions;
 mod repo;
 #[cfg(feature = "v2020_2")]
index 511f9846520b2a714321002d5a24d2886bfcd2ee..d4a83478cf2a7512ef2280c10f0c936fea1a7312 100644 (file)
@@ -30,7 +30,7 @@ impl TestRepo {
 
 pub fn create_mtree(repo: &ostree::Repo) -> ostree::MutableTree {
     let mtree = ostree::MutableTree::new();
-    let file = gio::File::new_for_path(
+    let file = gio::File::for_path(
         Path::new(env!("CARGO_MANIFEST_DIR"))
             .join("tests")
             .join("data")